From a5b68d4fb0b86dd0c559883a76472db3a7168bc7 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Wed, 31 Oct 2012 16:09:28 +0000 Subject: [PATCH] * I2CP: Reduce log level when outbound queue is full (ticket #758) --- .../src/net/i2p/router/client/ClientConnectionRunner.java | 2 +- .../net/i2p/router/client/QueuedClientConnectionRunner.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index fc046f3e6c..446ccd3c07 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -56,7 +56,7 @@ import net.i2p.util.SimpleTimer; * @author jrandom */ class ClientConnectionRunner { - private final Log _log; + protected final Log _log; protected final RouterContext _context; private final ClientManager _manager; /** socket for this particular peer connection */ diff --git a/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java b/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java index 7f23f051bc..aa2e9415c3 100644 --- a/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java @@ -5,6 +5,7 @@ import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.internal.I2CPMessageQueue; import net.i2p.internal.QueuedI2CPMessageReader; import net.i2p.router.RouterContext; +import net.i2p.util.Log; /** * Zero-copy in-JVM. @@ -67,8 +68,8 @@ class QueuedClientConnectionRunner extends ClientConnectionRunner { // with non-blocking writes for the router // and blocking writes for the client? boolean success = queue.offer(msg); - if (!success) - throw new I2CPMessageException("I2CP write to queue failed"); + if (!success && _log.shouldLog(Log.WARN)) + _log.warn("I2CP write to queue failed: " + msg); } } -- GitLab