From 0f11d3566ac9bbc2e6f323bbb11c5e0ed1ffc081 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 31 Oct 2013 21:15:09 +0000 Subject: [PATCH] log tweaks --- .../message/OutboundClientMessageOneShotJob.java | 2 +- .../i2p/router/transport/ntcp/NTCPConnection.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java index bae5b54f9a..8c20f72d46 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java @@ -691,7 +691,7 @@ public class OutboundClientMessageOneShotJob extends JobImpl { long sendTime = getContext().clock().now() - _start; if (_log.shouldLog(Log.WARN)) - _log.warn(getJobId() + ": Failed to send the message " + _clientMessageId + " to " + _toString + + _log.warn(getJobId() + ": Send failed (cause: " + status + ") " + _clientMessageId + " to " + _toString + " out " + _outTunnel + " in " + _lease + " ack " + _inTunnel + " after " + sendTime + "ms"); diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index 7364fcbcc6..fb1a3ff69c 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -1059,8 +1059,8 @@ class NTCPConnection { if (msg != null) { _lastSendTime = System.currentTimeMillis(); _context.statManager().addRateData("ntcp.sendTime", msg.getSendTime()); - if (_log.shouldLog(Log.INFO)) { - _log.info("I2NP message " + _messagesWritten + "/" + msg.getMessageId() + " sent after " + if (_log.shouldLog(Log.DEBUG)) { + _log.debug("I2NP message " + _messagesWritten + "/" + msg.getMessageId() + " sent after " + msg.getSendTime() + "/" + msg.getLifetime() + " with " + buf.capacity() + " bytes (uid=" + System.identityHashCode(msg)+" on " + toString() + ")"); @@ -1499,8 +1499,8 @@ class NTCPConnection { I2NPMessage read = h.lastRead(); long timeToRecv = System.currentTimeMillis() - _stateBegin; releaseHandler(h); - if (_log.shouldLog(Log.INFO)) - _log.info("I2NP message " + _messagesRead + "/" + (read != null ? read.getUniqueId() : 0) + if (_log.shouldLog(Log.DEBUG)) + _log.debug("I2NP message " + _messagesRead + "/" + (read != null ? read.getUniqueId() : 0) + " received after " + timeToRecv + " with " + _size +"/"+ (_blocks*16) + " bytes on " + NTCPConnection.this.toString()); _context.statManager().addRateData("ntcp.receiveTime", timeToRecv); _context.statManager().addRateData("ntcp.receiveSize", _size); @@ -1549,6 +1549,10 @@ class NTCPConnection { (_isInbound ? "from " : "to ") + (_remotePeer == null ? "unknown" : _remotePeer.calculateHash().toBase64().substring(0,6)) + (isEstablished() ? "" : " not established") + - " created " + DataHelper.formatDuration(getTimeSinceCreated()) + " ago"; + " created " + DataHelper.formatDuration(getTimeSinceCreated()) + " ago," + + " last send " + DataHelper.formatDuration(getTimeSinceSend()) + " ago," + + " last recv " + DataHelper.formatDuration(getTimeSinceReceive()) + " ago," + + " sent " + _messagesWritten + "," + + " rcvd " + _messagesRead; } }