merged RC_1_ into master

This commit is contained in:
arvidn 2016-06-26 18:07:21 -04:00
commit 263bd31782
1 changed files with 2 additions and 5 deletions

View File

@ -2690,12 +2690,9 @@ namespace libtorrent
#endif
#ifndef TORRENT_DISABLE_LOGGING
hasher h;
h.update(data.get(), p.length);
peer_log(peer_log_alert::incoming_message, "PIECE", "piece: %d s: %x l: %x ds: %d qs: %d q: %d hash: %s"
peer_log(peer_log_alert::incoming_message, "PIECE", "piece: %d s: %x l: %x ds: %d qs: %d q: %d"
, p.piece, p.start, p.length, statistics().download_rate()
, int(m_desired_queue_size), int(m_download_queue.size())
, aux::to_hex(h.final().to_string()).c_str());
, int(m_desired_queue_size), int(m_download_queue.size()));
#endif
if (p.length == 0)