fixed request timeout

This commit is contained in:
badaix 2015-07-11 00:24:04 +02:00
parent aba04a0675
commit 8f21948a4d
7 changed files with 24 additions and 16 deletions

View file

@ -109,6 +109,7 @@ void ServerSession::add(shared_ptr<msg::BaseMessage> message)
bool ServerSession::send(msg::BaseMessage* message)
{
// logD << "send: " << message->type << ", size: " << message->size << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
std::unique_lock<std::mutex> mlock(mutex_);
if (!socket_)
return false;
@ -124,13 +125,12 @@ bool ServerSession::send(msg::BaseMessage* message)
void ServerSession::getNextMessage()
{
//logD << "getNextMessage\n";
msg::BaseMessage baseMessage;
size_t baseMsgSize = baseMessage.getSize();
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";
// 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);