From 5241953e5d0a235bcf2d4d656ab44ad4eb9dea1b Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Tue, 15 Nov 2005 06:37:20 +0000
Subject: [PATCH] logging
---
.../transport/udp/OutboundMessageFragments.java | 15 +++++++++------
.../i2p/router/transport/udp/PeerTestManager.java | 4 ++--
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
index 997b4f42f2..23dba4b782 100644
--- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
+++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
@@ -564,12 +564,15 @@ public class OutboundMessageFragments {
if (state != null) {
int numSends = state.getMaxSends();
- if (state.getMessage() != null)
- state.getMessage().timestamp("acked after " + numSends
- + " lastReceived: "
- + (_context.clock().now() - state.getPeer().getLastReceiveTime())
- + " lastSentFully: "
- + (_context.clock().now() - state.getPeer().getLastSendFullyTime()));
+ if (state.getMessage() != null) {
+ PeerState peer = state.getPeer();
+ if (peer != null)
+ state.getMessage().timestamp("acked after " + numSends
+ + " lastReceived: "
+ + (_context.clock().now() - peer.getLastReceiveTime())
+ + " lastSentFully: "
+ + (_context.clock().now() - peer.getLastSendFullyTime()));
+ }
if (_log.shouldLog(Log.INFO))
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
index c177557843..cc030a6199 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
@@ -311,8 +311,8 @@ class PeerTestManager {
(from.getPort() == state.getCharliePort()) ) {
receiveFromCharlieAsBob(from, state);
} else {
- if (_log.shouldLog(Log.ERROR))
- _log.error("Received from a fourth party as bob! alice: " + state.getAliceIP() + ", charlie: " + state.getCharlieIP() + ", dave: " + from);
+ if (_log.shouldLog(Log.WARN))
+ _log.warn("Received from a fourth party as bob! alice: " + state.getAliceIP() + ", charlie: " + state.getCharlieIP() + ", dave: " + from);
}
} else if (state.getOurRole() == PeerTestState.CHARLIE) {
if ( (testIP == null) || (testPort <= 0) ) {
--
GitLab