log tweaks

This commit is contained in:
zzz
2013-10-31 21:15:09 +00:00
parent fa70d439c3
commit 0f11d3566a
2 changed files with 10 additions and 6 deletions

View File

@@ -691,7 +691,7 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
long sendTime = getContext().clock().now() - _start; long sendTime = getContext().clock().now() - _start;
if (_log.shouldLog(Log.WARN)) 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 + " out " + _outTunnel + " in " + _lease + " ack " + _inTunnel +
" after " + sendTime + "ms"); " after " + sendTime + "ms");

View File

@@ -1059,8 +1059,8 @@ class NTCPConnection {
if (msg != null) { if (msg != null) {
_lastSendTime = System.currentTimeMillis(); _lastSendTime = System.currentTimeMillis();
_context.statManager().addRateData("ntcp.sendTime", msg.getSendTime()); _context.statManager().addRateData("ntcp.sendTime", msg.getSendTime());
if (_log.shouldLog(Log.INFO)) { if (_log.shouldLog(Log.DEBUG)) {
_log.info("I2NP message " + _messagesWritten + "/" + msg.getMessageId() + " sent after " _log.debug("I2NP message " + _messagesWritten + "/" + msg.getMessageId() + " sent after "
+ msg.getSendTime() + "/" + msg.getSendTime() + "/"
+ msg.getLifetime() + msg.getLifetime()
+ " with " + buf.capacity() + " bytes (uid=" + System.identityHashCode(msg)+" on " + toString() + ")"); + " with " + buf.capacity() + " bytes (uid=" + System.identityHashCode(msg)+" on " + toString() + ")");
@@ -1499,8 +1499,8 @@ class NTCPConnection {
I2NPMessage read = h.lastRead(); I2NPMessage read = h.lastRead();
long timeToRecv = System.currentTimeMillis() - _stateBegin; long timeToRecv = System.currentTimeMillis() - _stateBegin;
releaseHandler(h); releaseHandler(h);
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.DEBUG))
_log.info("I2NP message " + _messagesRead + "/" + (read != null ? read.getUniqueId() : 0) _log.debug("I2NP message " + _messagesRead + "/" + (read != null ? read.getUniqueId() : 0)
+ " received after " + timeToRecv + " with " + _size +"/"+ (_blocks*16) + " bytes on " + NTCPConnection.this.toString()); + " received after " + timeToRecv + " with " + _size +"/"+ (_blocks*16) + " bytes on " + NTCPConnection.this.toString());
_context.statManager().addRateData("ntcp.receiveTime", timeToRecv); _context.statManager().addRateData("ntcp.receiveTime", timeToRecv);
_context.statManager().addRateData("ntcp.receiveSize", _size); _context.statManager().addRateData("ntcp.receiveSize", _size);
@@ -1549,6 +1549,10 @@ class NTCPConnection {
(_isInbound ? "from " : "to ") + (_isInbound ? "from " : "to ") +
(_remotePeer == null ? "unknown" : _remotePeer.calculateHash().toBase64().substring(0,6)) + (_remotePeer == null ? "unknown" : _remotePeer.calculateHash().toBase64().substring(0,6)) +
(isEstablished() ? "" : " not established") + (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;
} }
} }