From bb33b358b44788aa89a551c3fb571f3bf35dc86e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 2 May 2015 14:36:39 +0000
Subject: [PATCH] Change log level for Jetty warnings with exceptions from
error to warn (ticket #1551)
---
apps/jetty/java/src/net/i2p/jetty/I2PLogger.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
index cbf531801f..5d3e421293 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
@@ -102,7 +102,7 @@ public class I2PLogger implements Logger
if (arg0 == null && arg1 == null) {
_log.warn(msg);
} else if (arg0 != null && arg1 == null && arg0 instanceof Throwable) {
- _log.error(msg, (Throwable) arg0);
+ warn(msg, (Throwable) arg0);
} else if (_log.shouldLog(Log.WARN)) {
synchronized(_buffer) {
format(msg,arg0,arg1);
@@ -113,11 +113,12 @@ public class I2PLogger implements Logger
public void warn(String msg, Throwable th)
{
- // This doesn't cover ClassNotFoundException, etc.
- //if (th instanceof RuntimeException || th instanceof Error)
- _log.error(msg, th);
- //else
- // _log.warn(msg,th);
+ // some of these are serious, some aren't
+ // no way to get it right
+ if (th != null)
+ _log.logAlways(Log.WARN, msg + ": " + th);
+ else
+ _log.logAlways(Log.WARN, msg);
}
private void format(String msg, Object arg0, Object arg1)
--
GitLab