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 5aefb1588..887e425d4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -962,6 +962,18 @@ public class RouterConsoleRunner implements RouterApp { // No, we can't share the ConstraintSecurityHandler across all webapps // But we can force all webapps to use a single Timer thread // see HashSessionManager javadoc +/**** + // TODO kills rollover + + 2017/xx/xx 00:00:00 | Exception in thread "org.eclipse.jetty.util.RolloverFileOutputStream" java.lang.IllegalStateException: Task already scheduled or cancelled + 2017/xx/xx 00:00:00 | at java.util.Timer.sched(Timer.java:401) + 2017/xx/xx 00:00:00 | at java.util.Timer.schedule(Timer.java:208) + 2017/xx/xx 00:00:00 | at org.eclipse.jetty.util.RolloverFileOutputStream.scheduleNextRollover(RolloverFileOutputStream.java:195) + 2017/xx/xx 00:00:00 | at org.eclipse.jetty.util.RolloverFileOutputStream.access$200(RolloverFileOutputStream.java:46) + 2017/xx/xx 00:00:00 | at org.eclipse.jetty.util.RolloverFileOutputStream$RollTask.run(RolloverFileOutputStream.java:338) + 2017/xx/xx 00:00:00 | at java.util.TimerThread.mainLoop(Timer.java:555) + 2017/xx/xx 00:00:00 | at java.util.TimerThread.run(Timer.java:505) + synchronized(RouterConsoleRunner.class) { if (_jettyTimer == null) { _jettyTimer = new ScheduledExecutorScheduler("Console HashSessionScavenger", true); @@ -973,6 +985,7 @@ public class RouterConsoleRunner implements RouterApp { } context.getServletContext().setAttribute("org.eclipse.jetty.server.session.timer", _jettyTimer); } +****/ } /** diff --git a/history.txt b/history.txt index 1e1ea0f4a..1bbca819e 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2017-04-27 zzz + * Console: Disable Jetty timer thread consolidation + causing log file rollover to stop (ticket #1068) + 2017-04-26 zzz * HTTP Proxy: Add delay before jump page diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 14408f1ed..987fc2f75 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 = 18; + public final static long BUILD = 19; /** for example "-test" */ public final static String EXTRA = "-rc";