From 4a9424b485e265cac61dcffb93dd022fd7464691 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 2 Mar 2021 09:15:58 -0500 Subject: [PATCH] Transport: Don't record reachability changes in event log shortly after startup --- .../java/src/net/i2p/router/transport/ntcp/NTCPTransport.java | 3 ++- router/java/src/net/i2p/router/transport/udp/UDPTransport.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index cc5efda55..7ab1f196e 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -1534,9 +1534,10 @@ public class NTCPTransport extends TransportImpl { if (_log.shouldLog(Log.WARN)) _log.warn("Old status: " + old + " New status: " + status + " from: ", new Exception("traceback")); - if (old != Status.UNKNOWN) + if (old != Status.UNKNOWN && _context.router().getUptime() > 5*60*1000L) { _context.router().eventLog().addEvent(EventLog.REACHABILITY, "from " + _t(old.toStatusString()) + " to " + _t(status.toStatusString())); + } } _context.router().rebuildRouterInfo(); } diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index cad4d5421..39bb8b361 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -3288,9 +3288,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _log.warn("Old status: " + old + " New status: " + status + " Caused by update: " + newStatus + " from: ", new Exception("traceback")); - if (old != Status.UNKNOWN) + if (old != Status.UNKNOWN && _context.router().getUptime() > 5*60*1000L) { _context.router().eventLog().addEvent(EventLog.REACHABILITY, "from " + _t(old.toStatusString()) + " to " + _t(status.toStatusString())); + } // Always rebuild when the status changes, even if our address hasn't changed, // as rebuildExternalAddress() calls replaceAddress() which calls CSFI.notifyReplaceAddress() // which will start up NTCP inbound when we transition to OK.