From 8468f0ab5f5919e219f106bf5a3ca49de747b13e Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 6 Jan 2008 22:14:00 +0000 Subject: [PATCH] improved tracker logging --- src/http_tracker_connection.cpp | 33 ++++++++++++++++----------------- src/udp_tracker_connection.cpp | 12 ++++++++++-- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/http_tracker_connection.cpp b/src/http_tracker_connection.cpp index 79cdbfdb2..cdde89fa8 100755 --- a/src/http_tracker_connection.cpp +++ b/src/http_tracker_connection.cpp @@ -479,12 +479,8 @@ namespace libtorrent boost::shared_ptr cb = requester(); if (cb) { - cb->debug_log("==> TRACKER_REQUEST [ str: " + m_send_buffer + " ]"); - std::stringstream info_hash_str; - info_hash_str << req.info_hash; - cb->debug_log("info_hash: " - + boost::lexical_cast(req.info_hash)); - cb->debug_log("name lookup: " + hostname); + cb->debug_log("==> TRACKER_REQUEST [ ih: " + boost::lexical_cast(req.info_hash) + + " str: " + m_send_buffer + " ]"); } #endif @@ -500,6 +496,10 @@ namespace libtorrent void http_tracker_connection::on_timeout() { +#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) + boost::shared_ptr cb = requester(); + if (cb) cb->debug_log("*** HTTP_TRACKER [ timed out ]"); +#endif m_timed_out = true; asio::error_code ec; m_socket.close(ec); @@ -520,9 +520,8 @@ namespace libtorrent tracker_connection::close(); #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) boost::shared_ptr cb = requester(); - std::stringstream msg; - msg << "http_tracker_connection::close() " << m_man.num_requests(); - if (cb) cb->debug_log(msg.str()); + if (cb) cb->debug_log("*** HTTP_TRACKER [ close: " + + boost::lexical_cast(m_man.num_requests()) + " ]"); #endif } @@ -531,7 +530,7 @@ namespace libtorrent { boost::shared_ptr cb = requester(); #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) - if (cb) cb->debug_log("tracker name lookup handler called"); + if (cb) cb->debug_log("*** HTTP_TRACKER [ tracker name lookup handler called ]"); #endif if (error == asio::error::operation_aborted) return; if (m_timed_out) return; @@ -543,7 +542,7 @@ namespace libtorrent } #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) - if (cb) cb->debug_log("tracker name lookup successful"); + if (cb) cb->debug_log("*** HTTP_TRACKER [ name lookup successful ]"); #endif restart_read_timeout(); @@ -623,7 +622,7 @@ namespace libtorrent #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) boost::shared_ptr cb = requester(); - if (cb) cb->debug_log("tracker connection successful"); + if (cb) cb->debug_log("*** HTTP_TRACKER [ connection successful ]"); #endif restart_read_timeout(); @@ -644,7 +643,7 @@ namespace libtorrent #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) boost::shared_ptr cb = requester(); - if (cb) cb->debug_log("tracker send data completed"); + if (cb) cb->debug_log("*** HTTP_TRACKER [ send completed ]"); #endif restart_read_timeout(); TORRENT_ASSERT(m_buffer.size() - m_recv_pos > 0); @@ -676,8 +675,8 @@ namespace libtorrent TORRENT_ASSERT(bytes_transferred > 0); #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) boost::shared_ptr cb = requester(); - if (cb) cb->debug_log("tracker connection reading " - + boost::lexical_cast(bytes_transferred)); + if (cb) cb->debug_log("*** HTTP_TRACKER [ reading: " + + boost::lexical_cast(bytes_transferred) + " ]"); #endif m_recv_pos += bytes_transferred; @@ -765,7 +764,7 @@ namespace libtorrent } #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) - if (cb) cb->debug_log("Redirecting to \"" + location + "\""); + if (cb) cb->debug_log("*** HTTP_TRACKER [ redirecting to: " + location + "]"); #endif if (cb) cb->tracker_warning("Redirecting to \"" + location + "\""); tracker_request req = tracker_req(); @@ -789,7 +788,7 @@ namespace libtorrent std::string content_encoding = m_parser.header("content-encoding"); #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) - if (cb) cb->debug_log("content-encoding: \"" + content_encoding + "\""); + if (cb) cb->debug_log("*** HTTP_TRACKER [ content-encoding: " + content_encoding + "]"); #endif if (content_encoding == "gzip" || content_encoding == "x-gzip") diff --git a/src/udp_tracker_connection.cpp b/src/udp_tracker_connection.cpp index eb659ae82..b621089a8 100755 --- a/src/udp_tracker_connection.cpp +++ b/src/udp_tracker_connection.cpp @@ -100,6 +100,10 @@ namespace libtorrent ? m_settings.stop_tracker_timeout : m_settings.tracker_completion_timeout , m_settings.tracker_receive_timeout); +#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) + boost::shared_ptr cb = requester(); + if (cb) cb->debug_log(("*** UDP_TRACKER [ initiating name lookup: " + hostname + " ]").c_str()); +#endif } void udp_tracker_connection::name_lookup(asio::error_code const& error @@ -114,7 +118,7 @@ namespace libtorrent boost::shared_ptr cb = requester(); #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) - if (cb) cb->debug_log("udp tracker name lookup successful"); + if (cb) cb->debug_log("*** UDP_TRACKER [ name lookup successful ]"); #endif restart_read_timeout(); @@ -169,6 +173,10 @@ namespace libtorrent void udp_tracker_connection::on_timeout() { +#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) + boost::shared_ptr cb = requester(); + if (cb) cb->debug_log("*** UDP_TRACKER [ timed out ]"); +#endif asio::error_code ec; m_socket.close(ec); m_name_lookup.cancel(); @@ -293,7 +301,7 @@ namespace libtorrent if (cb) { std::stringstream msg; - msg << "<== UDP_TRACKER_CONNECT_RESPONSE [" << m_connection_id << "]"; + msg << "<== UDP_TRACKER_CONNECT_RESPONSE [ cid: " << m_connection_id << " ]"; cb->debug_log(msg.str()); } #endif