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

logging

Browse source 
git-svn-id: svn://elaine/murooma/trunk@330 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-12-29 17:33:54 +00:00
parent a51c000a2d
commit abf70b4030
14 changed files with 166 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/serverSession.cpp
View file

@ -39,19 +39,19 @@ void ServerSession::stop()
if (socket)
{
socket->shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
if (ec) cout << "Error in socket shutdown: " << ec << "\n";
if (ec) logE << "Error in socket shutdown: " << ec << "\n";
socket->close(ec);
if (ec) cout << "Error in socket close: " << ec << "\n";
if (ec) logE << "Error in socket close: " << ec << "\n";
}
if (readerThread)
{
cout << "joining readerThread\n";
logD << "joining readerThread\n";
readerThread->join();
delete readerThread;
}
if (writerThread)
{
cout << "joining readerThread\n";
logD << "joining readerThread\n";
writerThread->join();
delete writerThread;
}
@ -61,7 +61,7 @@ void ServerSession::stop()
}
readerThread = NULL;
writerThread = NULL;
cout << "ServerSession stopped\n";
logD << "ServerSession stopped\n";
}
@ -106,13 +106,13 @@ bool ServerSession::send(msg::BaseMessage* message)
void ServerSession::getNextMessage()
{
//cout << "getNextMessage\n";
//logD << "getNextMessage\n";
msg::BaseMessage baseMessage;
size_t baseMsgSize = baseMessage.getSize();
vector<char> buffer(baseMsgSize);
socketRead(&buffer[0], baseMsgSize);
baseMessage.deserialize(&buffer[0]);
//cout << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
//logD << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size);
socketRead(&buffer[0], baseMessage.size);
@ -137,7 +137,7 @@ void ServerSession::reader()
}
catch (const std::exception& e)
{
cout << kLogNotice << "Exception: " << e.what() << ", trying to reconnect" << std::endl;
logS(kLogErr) << "Exception: " << e.what() << ", trying to reconnect" << endl;
}
active_ = false;
}
@ -160,7 +160,7 @@ void ServerSession::writer()
}
catch (std::exception& e)
{
std::cerr << "Exception in thread: " << e.what() << "\n";
logE << "Exception in thread: " << e.what() << "\n";
}
active_ = false;
}