From 39dc60cf8ae95a6f9177cadfbb0af5fd56ecf63e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 2 Jun 2015 20:19:46 +0000
Subject: [PATCH] only log UPnP network disconnected error once
---
.../src/net/i2p/router/transport/UPnPManager.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java
index a1ad8db3a9..0ff6d5d848 100644
--- a/router/java/src/net/i2p/router/transport/UPnPManager.java
+++ b/router/java/src/net/i2p/router/transport/UPnPManager.java
@@ -37,7 +37,8 @@ class UPnPManager {
private volatile boolean _isRunning;
private volatile boolean _shouldBeRunning;
private volatile long _lastRescan;
- private volatile boolean _errorLogged;
+ private boolean _errorLogged;
+ private boolean _disconLogged;
private InetAddress _detectedAddress;
private final TransportManager _manager;
private final SimpleTimer2.TimedEvent _rescanner;
@@ -103,10 +104,14 @@ class UPnPManager {
_rescanner.schedule(RESCAN_SHORT_DELAY);
// Do we have a non-loopback, non-broadcast address?
// If not, that's why it failed (HTTPServer won't start)
- if (!Addresses.isConnected())
- _log.logAlways(Log.WARN, "UPnP start failed - no network connection?");
- else
+ if (!Addresses.isConnected()) {
+ if (!_disconLogged) {
+ _log.logAlways(Log.WARN, "UPnP start failed - no network connection?");
+ _disconLogged = true;
+ }
+ } else {
_log.error("UPnP start failed - port conflict?");
+ }
}
}
--
GitLab