diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java index beb225ca0d..9b386b423a 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java @@ -84,7 +84,7 @@ public class Servlet extends HttpServlet { this.thread.setDaemon(true); this.thread.setName("Addressbook"); this.thread.start(); - System.out.println("INFO: Starting Addressbook " + Daemon.VERSION); + //System.out.println("INFO: Starting Addressbook " + Daemon.VERSION); //System.out.println("INFO: config root under " + args[0]); } diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 8901d2fa40..f65c75208b 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -139,7 +139,8 @@ - + + diff --git a/apps/jetty/resources/log4j.properties b/apps/jetty/resources/log4j.properties new file mode 100644 index 0000000000..8899c004be --- /dev/null +++ b/apps/jetty/resources/log4j.properties @@ -0,0 +1,9 @@ + +# This is not needed by Jetty - but it helps with many web apps. + +log4j.rootLogger=INFO, stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n + 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 7c057de5ef..db9161fb26 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -221,7 +221,11 @@ public class RouterConsoleRunner { if (!workDirCreated) System.err.println("ERROR: Unable to create Jetty temporary work directory"); - Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext())); + try { + Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext())); + } catch (Throwable t) { + System.err.println("INFO: I2P Jetty logging class not found, logging to wrapper log"); + } // so Jetty can find WebAppConfiguration System.setProperty("jetty.class.path", I2PAppContext.getGlobalContext().getBaseDir() + "/lib/routerconsole.jar"); _server = new Server();