diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java index d249382fd..c385e7d2e 100644 --- a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java +++ b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java @@ -33,6 +33,11 @@ public class I2PLogger implements Logger StringBuilder _buffer = new StringBuilder(); + public I2PLogger() + { + this(I2PAppContext.getGlobalContext()); + } + public I2PLogger(I2PAppContext ctx) { _log = ctx.logManager().getLog(Server.class); @@ -105,6 +110,7 @@ public class I2PLogger implements Logger private void format(String msg, Object arg0, Object arg1) { + _buffer.setLength(0); int i0=msg==null?-1:msg.indexOf("{}"); int i1=i0<0?-1:msg.indexOf("{}",i0+2); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index db9161fb2..eb8bddd8c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -221,11 +221,14 @@ public class RouterConsoleRunner { if (!workDirCreated) System.err.println("ERROR: Unable to create Jetty temporary work directory"); - try { - Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext())); - } catch (Throwable t) { - System.err.println("INFO: I2P Jetty logging class not found, logging to wrapper log"); - } + //try { + // Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext())); + //} catch (Throwable t) { + // System.err.println("INFO: I2P Jetty logging class not found, logging to wrapper log"); + //} + // This way it doesn't try to load Slf4jLog first + System.setProperty("org.mortbay.log.class", "net.i2p.jetty.I2PLogger"); + // so Jetty can find WebAppConfiguration System.setProperty("jetty.class.path", I2PAppContext.getGlobalContext().getBaseDir() + "/lib/routerconsole.jar"); _server = new Server();