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

Console: Disable Jetty timer thread consolidation

Browse Source 
causing log file rollover to stop (ticket #1068)
This commit is contained in:
zzz
2017-04-27 13:43:24 +00:00
parent 06f78d7cfe
commit 4dec3657b0
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,6 +962,18 @@ public class RouterConsoleRunner implements RouterApp {
// No, we can't share the ConstraintSecurityHandler across all webapps // No, we can't share the ConstraintSecurityHandler across all webapps
// But we can force all webapps to use a single Timer thread // But we can force all webapps to use a single Timer thread
// see HashSessionManager javadoc // 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) { synchronized(RouterConsoleRunner.class) {
if (_jettyTimer == null) { if (_jettyTimer == null) {
_jettyTimer = new ScheduledExecutorScheduler("Console HashSessionScavenger", true); _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); context.getServletContext().setAttribute("org.eclipse.jetty.server.session.timer", _jettyTimer);
} }
****/
} }
/** /**

4
history.txt
View File

@ -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 2017-04-26 zzz
* HTTP Proxy: Add delay before jump page * HTTP Proxy: Add delay before jump page

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 18; public final static long BUILD = 19;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";