From 48f294024cd6f7a9f502e3fd37902cf90b8b0620 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 11 Nov 2015 13:20:42 +0000 Subject: [PATCH] snark log tweak --- .../src/org/klomp/snark/ConnectionAcceptor.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java index 057e0780f..18493854d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java +++ b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java @@ -24,6 +24,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.ConnectException; import net.i2p.I2PAppContext; import net.i2p.I2PException; @@ -213,6 +214,20 @@ class ConnectionAcceptor implements Runnable } } } + catch (ConnectException ioe) + { + // This is presumed to be due to socket closing by I2PSnarkUtil.disconnect(), + // which does not currently call our halt(), although it should + if (_log.shouldWarn()) + _log.warn("Error while accepting", ioe); + synchronized(this) { + if (!stop) { + locked_halt(); + thread = null; + stop = true; + } + } + } catch (IOException ioe) { int level = stop ? Log.WARN : Log.ERROR;