echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I2PLogger fix; better log init

Browse Source
This commit is contained in:
zzz
2011-12-31 00:49:39 +00:00
parent c0662bc111
commit beb6d1f43f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
View File

@ -33,6 +33,11 @@ public class I2PLogger implements Logger
StringBuilder _buffer = new StringBuilder(); StringBuilder _buffer = new StringBuilder();
public I2PLogger()
{
this(I2PAppContext.getGlobalContext());
}
public I2PLogger(I2PAppContext ctx) public I2PLogger(I2PAppContext ctx)
{ {
_log = ctx.logManager().getLog(Server.class); _log = ctx.logManager().getLog(Server.class);
@ -105,6 +110,7 @@ public class I2PLogger implements Logger
private void format(String msg, Object arg0, Object arg1) private void format(String msg, Object arg0, Object arg1)
{ {
_buffer.setLength(0);
int i0=msg==null?-1:msg.indexOf("{}"); int i0=msg==null?-1:msg.indexOf("{}");
int i1=i0<0?-1:msg.indexOf("{}",i0+2); int i1=i0<0?-1:msg.indexOf("{}",i0+2);

13
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -221,11 +221,14 @@ public class RouterConsoleRunner {
if (!workDirCreated) if (!workDirCreated)
System.err.println("ERROR: Unable to create Jetty temporary work directory"); System.err.println("ERROR: Unable to create Jetty temporary work directory");
try { //try {
Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext())); // Log.setLog(new I2PLogger(I2PAppContext.getGlobalContext()));
} catch (Throwable t) { //} catch (Throwable t) {
System.err.println("INFO: I2P Jetty logging class not found, logging to wrapper log"); // 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 // so Jetty can find WebAppConfiguration
System.setProperty("jetty.class.path", I2PAppContext.getGlobalContext().getBaseDir() + "/lib/routerconsole.jar"); System.setProperty("jetty.class.path", I2PAppContext.getGlobalContext().getBaseDir() + "/lib/routerconsole.jar");
_server = new Server(); _server = new Server();