From 5bec9f6764f36e1512505ee82f65fcf8bea7cb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 10 Jul 2015 23:25:35 -0400
Subject: [PATCH] log cleanup
---
include/opendht/dhtrunner.h | 2 +-
src/dht.cpp | 10 ++++------
tools/dhtnode.cpp | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h
index e48e9df9..6b1d563c 100644
--- a/include/opendht/dhtrunner.h
+++ b/include/opendht/dhtrunner.h
@@ -266,7 +266,7 @@ public:
std::lock_guard<std::mutex> lck(dht_mtx);
return dht_->getRoutingTablesLog(af);
}
- std::string getSearchesLog(sa_family_t af) const
+ std::string getSearchesLog(sa_family_t af = 0) const
{
std::lock_guard<std::mutex> lck(dht_mtx);
return dht_->getSearchesLog(af);
diff --git a/src/dht.cpp b/src/dht.cpp
index fb10126e..709012ce 100644
--- a/src/dht.cpp
+++ b/src/dht.cpp
@@ -1950,7 +1950,7 @@ Dht::getStorageLog() const
}
-std::string
+std::string
Dht::getRoutingTablesLog(sa_family_t af) const
{
auto& list = (af == AF_INET) ? buckets : buckets6;
@@ -1960,7 +1960,7 @@ Dht::getRoutingTablesLog(sa_family_t af) const
return out.str();
}
-std::string
+std::string
Dht::getSearchesLog(sa_family_t af) const
{
std::stringstream out;
@@ -2360,9 +2360,9 @@ Dht::processMessage(const uint8_t *buf, size_t buflen, const sockaddr *from, soc
}
break;
case MessageType::Ping:
- DHT_DEBUG("Got ping (%d)!", tid.length);
+ //DHT_DEBUG("Got ping (%d)!", tid.length);
newNode(id, from, fromlen, 1);
- DHT_DEBUG("Sending pong.");
+ //DHT_DEBUG("Sending pong.");
sendPong(from, fromlen, tid);
break;
case MessageType::FindNode:
@@ -2514,8 +2514,6 @@ Dht::periodic(const uint8_t *buf, size_t buflen,
uniform_duration_distribution<> {seconds(5) , seconds(25)}
: uniform_duration_distribution<> {seconds(60), seconds(180)};
confirm_nodes_time = now + time_dis(rd);
-
- dumpTables();
}
return std::min(confirm_nodes_time, search_time);
diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp
index e212bcf8..8ed04157 100644
--- a/tools/dhtnode.cpp
+++ b/tools/dhtnode.cpp
@@ -176,7 +176,7 @@ main(int argc, char **argv)
continue;
} else if (op == "ls") {
std::cout << "Searches:" << std::endl;
- std::cout << dht.getSearchesLog(AF_INET) << std::endl;
+ std::cout << dht.getSearchesLog() << std::endl;
continue;
} else if (op == "log") {
dht.setLoggers(
--
GitLab