From ff2ea9ac3e8a46e6cc81a0d33020c53392632662 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Mon, 8 Jun 2015 19:35:18 +0000 Subject: [PATCH] Irc{Outbound,Inbound}Filter: - Silence 'no streams' warning when we can't connect to an IRC server. Change to WARN. --- .../java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java | 4 ++-- .../java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java | 4 ++-- history.txt | 2 ++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java index 5f0dd8333..2a2edf0db 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java @@ -47,8 +47,8 @@ public class IrcInboundFilter implements Runnable { in = new BufferedReader(new InputStreamReader(remote.getInputStream(), "ISO-8859-1")); output=local.getOutputStream(); } catch (IOException e) { - if (_log.shouldLog(Log.ERROR)) - _log.error("IrcInboundFilter: no streams",e); + if (_log.shouldLog(Log.WARN)) + _log.warn("IrcInboundFilter: no streams",e); return; } if (_log.shouldLog(Log.DEBUG)) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java index 5e142081a..75ce191e7 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java @@ -47,8 +47,8 @@ public class IrcOutboundFilter implements Runnable { in = new BufferedReader(new InputStreamReader(local.getInputStream(), "ISO-8859-1")); output=remote.getOutputStream(); } catch (IOException e) { - if (_log.shouldLog(Log.ERROR)) - _log.error("IrcOutboundFilter: no streams",e); + if (_log.shouldLog(Log.WARN)) + _log.warn("IrcOutboundFilter: no streams",e); return; } if (_log.shouldLog(Log.DEBUG)) diff --git a/history.txt b/history.txt index e635ad677..237a51474 100644 --- a/history.txt +++ b/history.txt @@ -3,6 +3,8 @@ * Make netDb.storeFloodNew graphable for testing (#1195) * Directly connect to nearby floodfills to share our RI to speed up integration of new floodfills (#1195) + * Silence Irc{Inbound,Outbound}Filter warnings about 'no streams' + when we can't connect to an IRC server. Change to WARN. 2015-06-06 str4d * newsxml: Don't use XXX for parsing dates on Android diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 0725033fa..f6e6df3a5 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 3; + public final static long BUILD = 4; /** for example "-test" */ public final static String EXTRA = "";