diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java index f8e92f8c99936d18d6b0d64f30369e590e5e8d24..02d5d116a40f9884ca2aa365fabe714fb7f59320 100644 --- a/router/java/src/net/i2p/router/Blocklist.java +++ b/router/java/src/net/i2p/router/Blocklist.java @@ -125,8 +125,8 @@ public class Blocklist { if (isBlocklisted(peer)) count++; } - if (count > 0 && _log.shouldLog(Log.ERROR)) - _log.error("Blocklisted " + count + " routers in the netDb."); + if (count > 0 && _log.shouldLog(Log.WARN)) + _log.warn("Blocklisted " + count + " routers in the netDb."); for (Iterator iter = _peerBlocklist.keySet().iterator(); iter.hasNext(); ) { Hash peer = (Hash) iter.next(); String reason = "Blocklisted by router hash"; @@ -246,13 +246,13 @@ public class Blocklist { return; } _blocklistSize = count - removed; - if (_log.shouldLog(Log.ERROR)) { - _log.error("Removed " + badcount + " bad entries and comment lines"); - _log.error("Read " + count + " valid entries from the blocklist " + BLFile); - _log.error("Merged " + removed + " overlapping entries"); - _log.error("Result is " + _blocklistSize + " entries"); - _log.error("Blocking " + ipcount + " IPs and " + peercount + " hashes"); - _log.error("Blocklist processing finished, time: " + (_context.clock().now() - start)); + if (_log.shouldLog(Log.WARN)) { + _log.warn("Removed " + badcount + " bad entries and comment lines"); + _log.warn("Read " + count + " valid entries from the blocklist " + BLFile); + _log.warn("Merged " + removed + " overlapping entries"); + _log.warn("Result is " + _blocklistSize + " entries"); + _log.warn("Blocking " + ipcount + " IPs and " + peercount + " hashes"); + _log.warn("Blocklist processing finished, time: " + (_context.clock().now() - start)); } } @@ -443,8 +443,8 @@ public class Blocklist { if (ip.length != 4) return; if (add(toInt(ip))) - if (_log.shouldLog(Log.ERROR)) - _log.error("Adding IP to blocklist: " + (ip[0]&0xff) + '.' + (ip[1]&0xff) + '.' + (ip[2]&0xff) + '.' + (ip[3]&0xff)); + if (_log.shouldLog(Log.WARN)) + _log.warn("Adding IP to blocklist: " + (ip[0]&0xff) + '.' + (ip[1]&0xff) + '.' + (ip[2]&0xff) + '.' + (ip[3]&0xff)); } private boolean add(int ip) { @@ -737,8 +737,8 @@ public class Blocklist { reason = reason + '.'; } reason = reason + " blocklisted by entry \"" + buf + "\""; - if (_log.shouldLog(Log.ERROR)) - _log.error("Shitlisting " + peer + " " + reason); + if (_log.shouldLog(Log.WARN)) + _log.warn("Shitlisting " + peer + " " + reason); _context.shitlist().shitlistRouterForever(peer, reason); return; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index b4e49f725a64dee51c924ede7d7c1c7b00c2b5eb..1b00a1b251373fdc084e0357b2c3173491951327 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -93,16 +93,16 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { if (prevNetDb == null) { if ((!getContext().shitlist().isShitlistedForever(key)) && getContext().blocklist().isBlocklisted(key) && - _log.shouldLog(Log.ERROR)) - _log.error("Blocklisting new peer " + key); + _log.shouldLog(Log.WARN)) + _log.warn("Blocklisting new peer " + key); } else { Set oldAddr = prevNetDb.getAddresses(); Set newAddr = _message.getRouterInfo().getAddresses(); if (newAddr != null && (!newAddr.equals(oldAddr)) && (!getContext().shitlist().isShitlistedForever(key)) && getContext().blocklist().isBlocklisted(key) && - _log.shouldLog(Log.ERROR)) - _log.error("New address received, Blocklisting old peer " + key); + _log.shouldLog(Log.WARN)) + _log.warn("New address received, Blocklisting old peer " + key); } } getContext().profileManager().heardAbout(key);