From b66bc39db348e06da061cdb4fadbe09789d73218 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 16 Apr 2016 16:14:30 +0000
Subject: [PATCH] log tweak
---
.../i2p/router/client/ClientMessageEventListener.java | 9 +++++++--
.../src/net/i2p/router/client/MessageReceivedJob.java | 7 +++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
index d5697571e0..a50a6c9bce 100644
--- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
+++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
@@ -407,6 +407,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
/**
* The client asked for a message, so we send it to them.
*
+ * This is only when not in fast receive mode.
+ * In the default fast receive mode, data is sent in MessageReceivedJob.
*/
private void handleReceiveBegin(ReceiveMessageBeginMessage message) {
if (_runner.isDead()) return;
@@ -427,8 +429,11 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
try {
_runner.doSend(msg);
} catch (I2CPMessageException ime) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Error delivering the payload", ime);
+ String emsg = "Error sending data to client " + _runner.getDestHash();
+ if (_log.shouldWarn())
+ _log.warn(emsg, ime);
+ else
+ _log.logAlways(Log.WARN, emsg);
_runner.removePayload(new MessageId(message.getMessageId()));
}
}
diff --git a/router/java/src/net/i2p/router/client/MessageReceivedJob.java b/router/java/src/net/i2p/router/client/MessageReceivedJob.java
index 3614d16930..02ecc8dd62 100644
--- a/router/java/src/net/i2p/router/client/MessageReceivedJob.java
+++ b/router/java/src/net/i2p/router/client/MessageReceivedJob.java
@@ -60,8 +60,11 @@ class MessageReceivedJob extends JobImpl {
messageAvailable(id, _payload.getSize());
}
} catch (I2CPMessageException ime) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Error writing out the message", ime);
+ String msg = "Error sending data to client " + _runner.getDestHash();
+ if (_log.shouldWarn())
+ _log.warn(msg, ime);
+ else
+ _log.logAlways(Log.WARN, msg);
if (id != null && !_sendDirect)
_runner.removePayload(id);
}
--
GitLab