twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-09 06:18:02 +00:00
Code Issues Projects Releases Wiki Activity

make debug.log less verbose by default

Browse Source
This commit is contained in:
Miguel Freitas 2014-04-11 18:26:39 -03:00
parent d4b1c9b569
commit fdb08e9ca0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtorrent/src/session_impl.cpp
View File

@ -2747,7 +2747,7 @@ retry:
if (m_paused) if (m_paused)
{ {
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
session_log(" <== INCOMING CONNECTION [ ignored, paused ]"); //session_log(" <== INCOMING CONNECTION [ ignored, paused ]");
#endif #endif
return; return;
} }
@ -2768,10 +2768,12 @@ retry:
TORRENT_ASSERT(endp.address() != address_v4::any()); TORRENT_ASSERT(endp.address() != address_v4::any());
/*
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
session_log(" <== INCOMING CONNECTION %s type: %s" session_log(" <== INCOMING CONNECTION %s type: %s"
, print_endpoint(endp).c_str(), s->type_name()); , print_endpoint(endp).c_str(), s->type_name());
#endif #endif
*/
if (m_alerts.should_post<incoming_connection_alert>()) if (m_alerts.should_post<incoming_connection_alert>())
{ {

12
src/twister.cpp
View File

@ -39,6 +39,7 @@ twister::twister()
#define DEBUG_ACCEPT_POST 1 #define DEBUG_ACCEPT_POST 1
//#define DEBUG_EXPIRE_DHT_ITEM 1 //#define DEBUG_EXPIRE_DHT_ITEM 1
//#define DEBUG_MAINTAIN_DHT_NODES 1 //#define DEBUG_MAINTAIN_DHT_NODES 1
//#define DEBUG_NEIGHBOR_TORRENT 1
using namespace libtorrent; using namespace libtorrent;
static session *ses = NULL; static session *ses = NULL;
@ -616,11 +617,12 @@ void ThreadSessionAlerts()
} }
if( !knownTorrent ) { if( !knownTorrent ) {
if( !neighborCheck.count(ih) ) { if( !neighborCheck.count(ih) ) {
#if DEBUG_NEIGHBOR_TORRENT
printf("possiblyNeighbor of [%s,%s,%s] - starting a new dhtget to be sure\n", printf("possiblyNeighbor of [%s,%s,%s] - starting a new dhtget to be sure\n",
n->string().c_str(), n->string().c_str(),
r->string().c_str(), r->string().c_str(),
t->string().c_str()); t->string().c_str());
#endif
neighborCheck[ih] = false; neighborCheck[ih] = false;
ses->dht_getData(n->string(), r->string(), t->string() == "m"); ses->dht_getData(n->string(), r->string(), t->string() == "m");
} else if( neighborCheck[ih] ) { } else if( neighborCheck[ih] ) {
@ -628,9 +630,10 @@ void ThreadSessionAlerts()
if( !statusCheck.count(ihStatus) || if( !statusCheck.count(ihStatus) ||
statusCheck[ihStatus] + 3600 < GetTime() ) { statusCheck[ihStatus] + 3600 < GetTime() ) {
#if DEBUG_NEIGHBOR_TORRENT
printf("known neighbor. starting a new dhtget check of [%s,%s,%s]\n", printf("known neighbor. starting a new dhtget check of [%s,%s,%s]\n",
n->string().c_str(), "status", "s"); n->string().c_str(), "status", "s");
#endif
statusCheck[ihStatus] = GetTime(); statusCheck[ihStatus] = GetTime();
ses->dht_getData(n->string(), "status", false); ses->dht_getData(n->string(), "status", false);
} }
@ -647,10 +650,11 @@ void ThreadSessionAlerts()
dht_reply_data_done_alert const* dd = alert_cast<dht_reply_data_done_alert>(*i); dht_reply_data_done_alert const* dd = alert_cast<dht_reply_data_done_alert>(*i);
if (dd) if (dd)
{ {
#if DEBUG_NEIGHBOR_TORRENT
printf("get_data_done [%s,%s,%s] is_neighbor=%d got_data=%d\n", printf("get_data_done [%s,%s,%s] is_neighbor=%d got_data=%d\n",
dd->m_username.c_str(), dd->m_resource.c_str(), dd->m_multi ? "m" : "s", dd->m_username.c_str(), dd->m_resource.c_str(), dd->m_multi ? "m" : "s",
dd->m_is_neighbor, dd->m_got_data); dd->m_is_neighbor, dd->m_got_data);
#endif
sha1_hash ih = dhtTargetHash(dd->m_username, dd->m_resource, dd->m_multi ? "m" : "s"); sha1_hash ih = dhtTargetHash(dd->m_username, dd->m_resource, dd->m_multi ? "m" : "s");
{ {
@ -666,8 +670,10 @@ void ThreadSessionAlerts()
if( neighborCheck.count(ih) ) { if( neighborCheck.count(ih) ) {
neighborCheck[ih] = dd->m_is_neighbor; neighborCheck[ih] = dd->m_is_neighbor;
if( dd->m_is_neighbor && dd->m_resource == "tracker" ) { if( dd->m_is_neighbor && dd->m_resource == "tracker" ) {
#if DEBUG_NEIGHBOR_TORRENT
printf("is neighbor. starting a new dhtget check of [%s,%s,%s]\n", printf("is neighbor. starting a new dhtget check of [%s,%s,%s]\n",
dd->m_username.c_str(), "status", "s"); dd->m_username.c_str(), "status", "s");
#endif
sha1_hash ihStatus = dhtTargetHash(dd->m_username, "status", "s"); sha1_hash ihStatus = dhtTargetHash(dd->m_username, "status", "s");
statusCheck[ihStatus] = GetTime(); statusCheck[ihStatus] = GetTime();
ses->dht_getData(dd->m_username, "status", false); ses->dht_getData(dd->m_username, "status", false);