From 19992b1d1b6c4d2b04b3c6e367bc53efa3417ffb Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 1 Jun 2008 20:24:43 +0000
Subject: [PATCH] * Logging: Move common WARN output to DEBUG so we can ask
users to set the default log level to WARN without massive spewage
---
core/java/src/net/i2p/crypto/ElGamalAESEngine.java | 8 ++++----
core/java/src/net/i2p/stat/Rate.java | 4 ++--
.../src/net/i2p/router/message/GarlicMessageBuilder.java | 8 ++++----
.../java/src/net/i2p/router/peermanager/PeerManager.java | 4 ++--
.../java/src/net/i2p/router/peermanager/PeerProfile.java | 4 ++--
.../net/i2p/router/transport/FIFOBandwidthRefiller.java | 4 ++--
.../i2p/router/transport/udp/InboundMessageFragments.java | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
index 31f2f104b0..9b129835e5 100644
--- a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
+++ b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
@@ -93,8 +93,8 @@ public class ElGamalAESEngine {
decrypted = decryptExistingSession(data, key, targetPrivateKey, foundTags, usedKey, foundKey);
if (decrypted != null) {
_context.statManager().updateFrequency("crypto.elGamalAES.decryptExistingSession");
- if ( (foundTags.size() > 0) && (_log.shouldLog(Log.WARN)) )
- _log.warn(id + ": ElG/AES decrypt success with " + st + ": found tags: " + foundTags);
+ if ( (foundTags.size() > 0) && (_log.shouldLog(Log.DEBUG)) )
+ _log.debug(id + ": ElG/AES decrypt success with " + st + ": found tags: " + foundTags);
wasExisting = true;
} else {
_context.statManager().updateFrequency("crypto.elGamalAES.decryptFailed");
@@ -107,8 +107,8 @@ public class ElGamalAESEngine {
decrypted = decryptNewSession(data, targetPrivateKey, foundTags, usedKey, foundKey);
if (decrypted != null) {
_context.statManager().updateFrequency("crypto.elGamalAES.decryptNewSession");
- if ( (foundTags.size() > 0) && (_log.shouldLog(Log.WARN)) )
- _log.warn("ElG decrypt success: found tags: " + foundTags);
+ if ( (foundTags.size() > 0) && (_log.shouldLog(Log.DEBUG)) )
+ _log.debug("ElG decrypt success: found tags: " + foundTags);
} else {
_context.statManager().updateFrequency("crypto.elGamalAES.decryptFailed");
if (_log.shouldLog(Log.WARN))
diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java
index a8b6553cc3..54ac391d48 100644
--- a/core/java/src/net/i2p/stat/Rate.java
+++ b/core/java/src/net/i2p/stat/Rate.java
@@ -189,8 +189,8 @@ public class Rate {
long measuredPeriod = now - _lastCoalesceDate;
if (measuredPeriod < _period - SLACK) {
// no need to coalesce (assuming we only try to do so once per minute)
- if (_log.shouldLog(Log.WARN))
- _log.warn("not coalescing, measuredPeriod = " + measuredPeriod + " period = " + _period);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("not coalescing, measuredPeriod = " + measuredPeriod + " period = " + _period);
return;
}
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
index 23ca08466d..5d6b37a96c 100644
--- a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
+++ b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
@@ -123,13 +123,13 @@ public class GarlicMessageBuilder {
long timeFromNow = config.getExpiration() - ctx.clock().now();
if (timeFromNow < 1*1000) {
- if (log.shouldLog(Log.WARN))
- log.warn("Building a message expiring in " + timeFromNow + "ms: " + config, new Exception("created by"));
+ if (log.shouldLog(Log.DEBUG))
+ log.debug("Building a message expiring in " + timeFromNow + "ms: " + config, new Exception("created by"));
return null;
}
- if (log.shouldLog(Log.WARN))
- log.warn("CloveSet size for message " + msg.getUniqueId() + " is " + cloveSet.length
+ if (log.shouldLog(Log.DEBUG))
+ log.debug("CloveSet size for message " + msg.getUniqueId() + " is " + cloveSet.length
+ " and encrypted message data is " + encData.length);
return msg;
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index 38cbc6236f..2fcebfedf2 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -225,8 +225,8 @@ class PeerManager {
if (caps.indexOf(capability) >= 0)
rv.add(ri.getIdentity().calculateHash());
}
- if (_log.shouldLog(Log.WARN))
- _log.warn("Peers with capacity " + capability + ": " + rv.size());
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Peers with capacity " + capability + ": " + rv.size());
return rv;
}
}
diff --git a/router/java/src/net/i2p/router/peermanager/PeerProfile.java b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
index 5dd8f9365d..c8c51ba5ea 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerProfile.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
@@ -302,13 +302,13 @@ public class PeerProfile {
}
}
- if (_log.shouldLog(Log.WARN) ) {
+ if (_log.shouldLog(Log.DEBUG) ) {
StringBuffer buf = new StringBuffer(128);
buf.append("Updating 1m throughput after ").append(size).append(" to ");
for (int i = 0; i < THROUGHPUT_COUNT; i++)
buf.append(_peakTunnel1mThroughput[i]).append(',');
buf.append(" for ").append(_peer.toBase64());
- _log.warn(buf.toString());
+ _log.debug(buf.toString());
}
}
}
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
index ea6223ce16..b71bcf40a6 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
@@ -124,8 +124,8 @@ class FIFOBandwidthRefiller implements Runnable {
}
return true;
} else {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Refresh delay too fast (" + numMs + ")");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Refresh delay too fast (" + numMs + ")");
return false;
}
}
diff --git a/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java
index e0d309526e..a8f54c21d8 100644
--- a/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java
+++ b/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java
@@ -110,8 +110,8 @@ public class InboundMessageFragments /*implements UDPTransport.PartialACKSource
_context.statManager().addRateData("udp.ignoreRecentDuplicate", 1, 0);
from.messageFullyReceived(messageId, -1);
_ackSender.ackPeer(from);
- if (_log.shouldLog(Log.WARN))
- _log.warn("Message received is a dup: " + mid + " dups: "
+ if (_log.shouldLog(Log.INFO))
+ _log.info("Message received is a dup: " + mid + " dups: "
+ _recentlyCompletedMessages.getCurrentDuplicateCount() + " out of "
+ _recentlyCompletedMessages.getInsertedCount());
_context.messageHistory().droppedInboundMessage(mid, from.getRemotePeer(), "dup");
--
GitLab