Changeset 88e7d60

Timestamp:

Dec 4, 2011 6:49:50 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

489a0ea

Parents:

0d145fc

Message:

• IRC Client: Lower log level for connect error to warn (thx echelon/sponge)

File:

• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java (modified) (2 diffs)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

@@ -10 +10 @@
 import java.util.StringTokenizer;
 
+import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.Base32;
@@ -113 +114 @@
             Thread out = new I2PAppThread(new IrcOutboundFilter(s,i2ps, expectedPong, _log, dcc), "IRC Client " + __clientId + " out", true);
             out.start();
-        } catch (Exception ex) {
+        } catch (I2PException ex) {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Error connecting", ex);
+            //l.log("Error connecting: " + ex.getMessage());
+            closeSocket(s);
+            if (i2ps != null) {
+                synchronized (sockLock) {
+                    mySockets.remove(sockLock);
+                }
+            }
+        } catch (Exception ex) {
+            // generally NoRouteToHostException
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Error connecting", ex);
             //l.log("Error connecting: " + ex.getMessage());
             closeSocket(s);