Merge pull request #716 from majestrate/reduce-logging

reduce logging

llarp/dht/context.cpp

@@ -297,7 +297,7 @@ namespace llarp
     Context::Explore(size_t N)
     {
       // ask N random peers for new routers
-      llarp::LogInfo("Exploring network via ", N, " peers");
+      llarp::LogDebug("Exploring network via ", N, " peers");
       std::set< Key_t > peers;
 
       if(_nodes->GetManyRandom(peers, N))
@@ -306,7 +306,8 @@ namespace llarp
           ExploreNetworkVia(peer);
       }
       else
-        llarp::LogError("failed to select random nodes for exploration");
+        llarp::LogError("failed to select ", N,
+                        " random nodes for exploration");
     }
 
     void
@@ -608,8 +609,8 @@ namespace llarp
       TXOwner peer(askpeer, ++ids);
       _pendingTagLookups.NewTX(peer, asker, tag,
                                new TagLookup(asker, tag, this, R));
-      llarp::LogInfo("ask ", askpeer, " for ", tag, " on behalf of ", whoasked,
-                     " R=", R);
+      llarp::LogDebug("ask ", askpeer.SNode(), " for ", tag, " on behalf of ",
+                      whoasked.SNode(), " R=", R);
     }
 
     void
@@ -685,9 +686,9 @@ namespace llarp
     {
       TXOwner asker(whoasked, txid);
       TXOwner peer(askpeer, ++ids);
-       _pendingRouterLookups.NewTX(
-         peer, asker, target,
-         new RecursiveRouterLookup(asker, target, this, handler));
+      _pendingRouterLookups.NewTX(
+          peer, asker, target,
+          new RecursiveRouterLookup(asker, target, this, handler));
     }
 
     llarp_time_t

llarp/dht/explorenetworkjob.cpp

@@ -17,7 +17,7 @@ namespace llarp
     void
     ExploreNetworkJob::SendReply()
     {
-      llarp::LogInfo("got ", valuesFound.size(), " routers from exploration");
+      llarp::LogDebug("got ", valuesFound.size(), " routers from exploration");
 
       auto router = parent->GetRouter();
       using std::placeholders::_1;

llarp/dht/key.hpp

@@ -2,6 +2,7 @@
 #define LLARP_DHT_KEY_HPP
 
 #include <util/aligned.hpp>
+#include <router_id.hpp>
 
 #include <array>
 
@@ -28,6 +29,14 @@ namespace llarp
       {
       }
 
+      /// get snode address string
+      std::string
+      SNode() const
+      {
+        const RouterID rid{as_array()};
+        return rid.ToString();
+      }
+
       Key_t
       operator^(const Key_t& other) const
       {

llarp/dht/message.cpp

@@ -41,8 +41,8 @@ namespace llarp
           // bad msg size?
           if(strbuf.sz != 1)
             return false;
-          llarp::LogInfo("Handle DHT message ", *strbuf.base,
-                         " relayed=", relayed);
+          llarp::LogDebug("Handle DHT message ", *strbuf.base,
+                          " relayed=", relayed);
           switch(*strbuf.base)
           {
             case 'F':

llarp/dht/tx.hpp

@@ -106,14 +106,14 @@ namespace llarp
         if((prevPeer ^ targetKey) < (peer ^ targetKey))
         {
           // next peer is not closer
-          llarp::LogInfo("next peer ", peer, " is not closer to ", target,
-                         " than ", prevPeer);
+          llarp::LogDebug("next peer ", peer.SNode(), " is not closer to ",
+                          target, " than ", prevPeer.SNode());
           return false;
         }
       }
       else
       {
-        llarp::LogInfo("no more peers for request asking for ", target);
+        llarp::LogDebug("no more peers for request asking for ", target);
         return false;
       }
       peersAsked.insert(peer);

llarp/nodedb.cpp

@@ -129,7 +129,8 @@ llarp_nodedb::InsertAsync(llarp::RouterContact rc,
                           std::shared_ptr< llarp::Logic > logic,
                           std::function< void(void) > completionHandler)
 {
-  const auto job = std::bind(&handle_async_insert_rc, this, rc, logic, completionHandler);
+  const auto job =
+      std::bind(&handle_async_insert_rc, this, rc, logic, completionHandler);
   size_t tries = 10;
   while((!disk->addJob(job)) && tries-- > 0)
     std::this_thread::sleep_for(std::chrono::milliseconds(1));

llarp/router/router.cpp

@@ -1077,7 +1077,7 @@ namespace llarp
   bool
   Router::ShouldReportStats(llarp_time_t now) const
   {
-    static constexpr llarp_time_t ReportStatsInterval = 30 * 1000;
+    static constexpr llarp_time_t ReportStatsInterval = 60 * 60 * 1000;
     return now - m_LastStatsReport > ReportStatsInterval;
   }
 
@@ -1085,7 +1085,6 @@ namespace llarp
   Router::ReportStats()
   {
     const auto now = Now();
-    LogInfo("---- BEGIN REPORT ----");
     LogInfo(nodedb()->num_loaded(), " RCs loaded");
     LogInfo(bootstrapRCList.size(), " bootstrap peers");
     LogInfo(NumberOfConnectedRouters(), " router connections");
@@ -1097,7 +1096,6 @@ namespace llarp
     }
     LogInfo(now, " system time");
     LogInfo(m_LastStatsReport, " last reported stats");
-    LogInfo("----- END REPORT -----");
     m_LastStatsReport = now;
   }
 
@@ -1139,7 +1137,8 @@ namespace llarp
 
     std::set< RouterID > removeStale;
     // remove stale routers
-    const auto timeout = RouterContact::UpdateWindow * RouterContact::UpdateTries;
+    const auto timeout =
+        RouterContact::UpdateWindow * RouterContact::UpdateTries;
     nodedb()->VisitInsertedBefore(
         [&](const RouterContact &rc) {
           if(IsBootstrapNode(rc.pubkey))