From 25378e894bcf2c4ea35b7fed9f5e76e3149a2d7f Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Thu, 29 Jul 2004 20:36:44 +0000
Subject: [PATCH] less aggressive removal of peer references logging
---
router/java/src/net/i2p/router/Shitlist.java | 2 +-
.../router/networkdb/kademlia/ExpireRoutersJob.java | 2 +-
.../kademlia/KademliaNetworkDatabaseFacade.java | 10 ++++++----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java
index 7730b1ef7d..43c86e34df 100644
--- a/router/java/src/net/i2p/router/Shitlist.java
+++ b/router/java/src/net/i2p/router/Shitlist.java
@@ -59,7 +59,7 @@ public class Shitlist {
wasAlready = (null == oldDate);
}
- _context.netDb().fail(peer);
+ //_context.netDb().fail(peer);
_context.tunnelManager().peerFailed(peer);
return wasAlready;
}
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
index 87e088ad39..91732bf4b2 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
@@ -32,7 +32,7 @@ class ExpireRoutersJob extends JobImpl {
private Log _log;
private KademliaNetworkDatabaseFacade _facade;
- private final static long RERUN_DELAY_MS = 30*1000;
+ private final static long RERUN_DELAY_MS = 120*1000;
/**
* If a routerInfo structure isn't updated within an hour, drop it
* and search for a later version. This value should be large enough
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 2ce511ffce..0eff865d0f 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -506,13 +506,15 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
if (isRouterInfo) {
int remaining = _kb.size();
if (remaining < MIN_REMAINING_ROUTERS) {
- _log.warn("Not removing " + dbEntry + " because we have so few routers left ("
- + remaining + ") - perhaps a reseed is necessary?");
+ if (_log.shouldLog(Log.ERROR))
+ _log.error("Not removing " + dbEntry + " because we have so few routers left ("
+ + remaining + ") - perhaps a reseed is necessary?");
return;
}
if (System.currentTimeMillis() < _started + DONT_FAIL_PERIOD) {
- _log.warn("Not failing the key " + dbEntry.toBase64()
- + " since we've just started up and don't want to drop /everyone/");
+ if (_log.shouldLog(Log.WARN))
+ _log.warn("Not failing the key " + dbEntry.toBase64()
+ + " since we've just started up and don't want to drop /everyone/");
return;
}
--
GitLab