From 4e3ecc01b2bb7e52b7cc5f81cd546633fc2dfb1c Mon Sep 17 00:00:00 2001 From: rakshasa Date: Sun, 25 Sep 2011 13:25:36 +0000 Subject: [PATCH] * Changed tracker logging to use the new logging facilities. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1286 e378c898-3ddf-0310-93e7-cc216c733640 --- src/command_download.cc | 3 --- src/command_network.cc | 1 - src/core/manager.cc | 17 ----------------- src/main.cc | 2 -- 4 files changed, 23 deletions(-) diff --git a/src/command_download.cc b/src/command_download.cc index 1734ae88..d203cf22 100644 --- a/src/command_download.cc +++ b/src/command_download.cc @@ -309,9 +309,6 @@ cmd_d_initialize_logs(core::Download* download) { download->info()->signal_network_log().connect(sigc::mem_fun(control->core(), &core::Manager::push_log_complete)); download->info()->signal_storage_error().connect(sigc::mem_fun(control->core(), &core::Manager::push_log_complete)); - if (!rpc::call_command_string("log.tracker").empty()) - download->info()->signal_tracker_dump().connect(sigc::ptr_fun(&core::receive_tracker_dump)); - return torrent::Object(); } diff --git a/src/command_network.cc b/src/command_network.cc index 83972a01..ff586f66 100644 --- a/src/command_network.cc +++ b/src/command_network.cc @@ -484,7 +484,6 @@ initialize_command_network() { CMD2_ANY ("strings.ip_tos", std::bind(&torrent::option_list_strings, torrent::OPTION_IP_TOS)); CMD2_VAR_BOOL ("log.handshake", false); - CMD2_VAR_STRING ("log.tracker", ""); // CMD2_ANY_STRING ("encoding_list", std::bind(&apply_encoding_list, std::placeholders::_2)); CMD2_ANY_STRING ("encoding.add", std::bind(&apply_encoding_list, std::placeholders::_2)); diff --git a/src/core/manager.cc b/src/core/manager.cc index 13eb8a73..3c3e4639 100644 --- a/src/core/manager.cc +++ b/src/core/manager.cc @@ -78,23 +78,6 @@ namespace core { -void -receive_tracker_dump(const std::string& url, const char* data, size_t size) { - const std::string& filename = rpc::call_command_string("log.tracker"); - - if (filename.empty()) - return; - - std::fstream fstr(filename.c_str(), std::ios::out | std::ios::app); - - if (!fstr.is_open()) - return; - - fstr << "url: " << url << std::endl << "---" << std::endl; - fstr.write(data, size); - fstr << std::endl <<"---" << std::endl; -} - void Manager::handshake_log(const sockaddr* sa, int msg, int err, const torrent::HashString* hash) { if (!rpc::call_command_value("log.handshake")) diff --git a/src/main.cc b/src/main.cc index 8789ba8c..14ed43a7 100644 --- a/src/main.cc +++ b/src/main.cc @@ -432,8 +432,6 @@ main(int argc, char** argv) { CMD2_REDIRECT ("get_handshake_log", "log.handshake"); CMD2_REDIRECT_GENERIC("set_handshake_log", "log.handshake.set"); - CMD2_REDIRECT ("get_log.tracker", "log.tracker"); - CMD2_REDIRECT_GENERIC("set_log.tracker", "log.tracker.set"); CMD2_REDIRECT ("get_name", "session.name"); CMD2_REDIRECT_GENERIC("set_name", "session.name.set");