Merge master (0.60.3) into develop (0.70.0-b5)

This commit is contained in:
Nik Bougalis
2017-05-16 15:12:55 -07:00
7 changed files with 93 additions and 9 deletions

View File

@@ -210,6 +210,12 @@ PeerImp::send (Message::pointer const& m)
// a small senq periodically
large_sendq_ = 0;
}
else if ((sendq_size % Tuning::sendQueueLogFreq) == 0)
{
JLOG (journal_.debug()) <<
(name_.empty() ? remote_address_.to_string() : name_) <<
" sendq: " << sendq_size;
}
send_queue_.push(m);
@@ -442,7 +448,9 @@ PeerImp::fail(std::string const& reason)
shared_from_this(), reason));
if (socket_.is_open())
{
JLOG (journal_.warn()) << reason;
JLOG (journal_.warn()) <<
(name_.empty() ? remote_address_.to_string() : name_) <<
" failed: " << reason;
}
close();
}