3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-29 00:46:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

update logger

Browse source
This commit is contained in:
badaix 2017-07-24 18:59:49 +02:00
parent 2955b20e9d
commit ce55f15c02
36 changed files with 967 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/clientConnection.cpp
View file

@ -62,7 +62,7 @@ std::string ClientConnection::getMacAddress() const
std::string mac = ::getMacAddress(socket_->native_handle());
if (mac.empty())
mac = "00:00:00:00:00:00";
logO << "My MAC: \"" << mac << "\", socket: " << socket_->native_handle() << "\n";
LOG(INFO) << "My MAC: \"" << mac << "\", socket: " << socket_->native_handle() << "\n";
return mac;
}
@ -72,7 +72,7 @@ void ClientConnection::start()
tcp::resolver resolver(io_service_);
tcp::resolver::query query(tcp::v4(), host_, cpt::to_string(port_), asio::ip::resolver_query_base::numeric_service);
auto iterator = resolver.resolve(query);
logO << "Connecting\n";
LOG(DEBUG) << "Connecting\n";
socket_.reset(new tcp::socket(io_service_));
// struct timeval tv;
// tv.tv_sec = 5;
@ -82,7 +82,7 @@ void ClientConnection::start()
// setsockopt(socket->native_handle(), SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
socket_->connect(*iterator);
connected_ = true;
logS(kLogNotice) << "Connected to " << socket_->remote_endpoint().address().to_string() << endl;
SLOG(LOG_NOTICE) << "Connected to " << socket_->remote_endpoint().address().to_string() << endl;
active_ = true;
readerThread_ = new thread(&ClientConnection::reader, this);
}
@ -98,13 +98,13 @@ void ClientConnection::stop()
if (socket_)
{
socket_->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
if (ec) logE << "Error in socket shutdown: " << ec.message() << endl;
if (ec) LOG(ERROR) << "Error in socket shutdown: " << ec.message() << endl;
socket_->close(ec);
if (ec) logE << "Error in socket close: " << ec.message() << endl;
if (ec) LOG(ERROR) << "Error in socket close: " << ec.message() << endl;
}
if (readerThread_)
{
logD << "joining readerThread\n";
LOG(DEBUG) << "joining readerThread\n";
readerThread_->join();
delete readerThread_;
}
@ -114,18 +114,18 @@ void ClientConnection::stop()
}
readerThread_ = NULL;
socket_.reset();
logD << "readerThread terminated\n";
LOG(DEBUG) << "readerThread terminated\n";
}
bool ClientConnection::send(const msg::BaseMessage* message) const
{
// std::unique_lock<std::mutex> mlock(mutex_);
//logD << "send: " << message->type << ", size: " << message->getSize() << "\n";
//LOG(DEBUG) << "send: " << message->type << ", size: " << message->getSize() << "\n";
std::lock_guard<std::mutex> socketLock(socketMutex_);
if (!connected())
return false;
//logD << "send: " << message->type << ", size: " << message->getSize() << "\n";
//LOG(DEBUG) << "send: " << message->type << ", size: " << message->getSize() << "\n";
asio::streambuf streambuf;
std::ostream stream(&streambuf);
tv t;
@ -142,7 +142,7 @@ shared_ptr<msg::SerializedMessage> ClientConnection::sendRequest(const msg::Base
if (++reqId_ >= 10000)
reqId_ = 1;
message->id = reqId_;
// logO << "Req: " << message->id << "\n";
// LOG(INFO) << "Req: " << message->id << "\n";
shared_ptr<PendingRequest> pendingRequest(new PendingRequest(reqId_));
std::unique_lock<std::mutex> lock(pendingRequestsMutex_);
@ -152,12 +152,12 @@ shared_ptr<msg::SerializedMessage> ClientConnection::sendRequest(const msg::Base
{
response = pendingRequest->response;
sumTimeout_ = chronos::msec(0);
// logO << "Resp: " << pendingRequest->id << "\n";
// LOG(INFO) << "Resp: " << pendingRequest->id << "\n";
}
else
{
sumTimeout_ += timeout;
logO << "timeout while waiting for response to: " << reqId_ << ", timeout " << sumTimeout_.count() << "\n";
LOG(WARNING) << "timeout while waiting for response to: " << reqId_ << ", timeout " << sumTimeout_.count() << "\n";
if (sumTimeout_ > chronos::sec(10))
throw SnapException("sum timeout exceeded 10s");
}
@ -173,7 +173,7 @@ void ClientConnection::getNextMessage()
vector<char> buffer(baseMsgSize);
socketRead(&buffer[0], baseMsgSize);
baseMessage.deserialize(&buffer[0]);
// logD << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
// LOG(DEBUG) << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size);
// {
@ -185,7 +185,7 @@ void ClientConnection::getNextMessage()
{
std::unique_lock<std::mutex> lock(pendingRequestsMutex_);
// logD << "got lock - getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
// LOG(DEBUG) << "got lock - getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
{
for (auto req: pendingRequests_)
{