3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-05 18:57:41 +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

24
server/streamSession.cpp
View file

@ -80,18 +80,18 @@ void StreamSession::stop()
{
std::lock_guard<std::mutex> socketLock(socketMutex_);
socket_->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
if (ec) logE << "Error in socket shutdown: " << ec.message() << "\n";
if (ec) LOG(ERROR) << "Error in socket shutdown: " << ec.message() << "\n";
socket_->close(ec);
if (ec) logE << "Error in socket close: " << ec.message() << "\n";
if (ec) LOG(ERROR) << "Error in socket close: " << ec.message() << "\n";
}
if (readerThread_ && readerThread_->joinable())
{
logD << "joining readerThread\n";
LOG(DEBUG) << "joining readerThread\n";
readerThread_->join();
}
if (writerThread_ && writerThread_->joinable())
{
logD << "joining writerThread\n";
LOG(DEBUG) << "joining writerThread\n";
messages_.abort_wait();
writerThread_->join();
}
@ -103,7 +103,7 @@ void StreamSession::stop()
readerThread_ = nullptr;
writerThread_ = nullptr;
socket_ = nullptr;
logD << "StreamSession stopped\n";
LOG(DEBUG) << "StreamSession stopped\n";
}
@ -156,7 +156,7 @@ void StreamSession::setBufferMs(size_t bufferMs)
bool StreamSession::send(const msg::BaseMessage* message) const
{
//TODO on exception: set active = false
// logO << "send: " << message->type << ", size: " << message->getSize() << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
// LOG(INFO) << "send: " << message->type << ", size: " << message->getSize() << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
std::lock_guard<std::mutex> socketLock(socketMutex_);
{
std::lock_guard<std::mutex> activeLock(activeMutex_);
@ -169,7 +169,7 @@ bool StreamSession::send(const msg::BaseMessage* message) const
message->sent = t;
message->serialize(stream);
asio::write(*socket_.get(), streambuf);
// logO << "done: " << message->type << ", size: " << message->size << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
// LOG(INFO) << "done: " << message->type << ", size: " << message->size << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
return true;
}
@ -183,11 +183,11 @@ void StreamSession::getNextMessage()
baseMessage.deserialize(&buffer[0]);
if (baseMessage.size > msg::max_size)
{
logS(kLogErr) << "received message of type " << baseMessage.type << " to large: " << baseMessage.size << "\n";
SLOG(LOG_ERR) << "received message of type " << baseMessage.type << " to large: " << baseMessage.size << "\n";
stop();
return;
}
// logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
// LOG(INFO) << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size);
// {
@ -213,7 +213,7 @@ void StreamSession::reader()
}
catch (const std::exception& e)
{
logS(kLogErr) << "Exception in StreamSession::reader(): " << e.what() << endl;
SLOG(LOG_ERR) << "Exception in StreamSession::reader(): " << e.what() << endl;
}
if (active_ && (messageReceiver_ != NULL))
@ -241,7 +241,7 @@ void StreamSession::writer()
size_t age = 0;
if (now > wireChunk->start())
age = std::chrono::duration_cast<chronos::msec>(now - wireChunk->start()).count();
//logD << "PCM chunk. Age: " << age << ", buffer: " << bufferMs_ << ", age > buffer: " << (age > bufferMs_) << "\n";
//LOG(DEBUG) << "PCM chunk. Age: " << age << ", buffer: " << bufferMs_ << ", age > buffer: " << (age > bufferMs_) << "\n";
if (age > bufferMs_)
continue;
}
@ -252,7 +252,7 @@ void StreamSession::writer()
}
catch (const std::exception& e)
{
logS(kLogErr) << "Exception in StreamSession::writer(): " << e.what() << endl;
SLOG(LOG_ERR) << "Exception in StreamSession::writer(): " << e.what() << endl;
}
if (active_ && (messageReceiver_ != NULL))