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

- Fix class error on wrapper 3.1.1

Browse Source
This commit is contained in:
zzz
2012-01-09 23:59:58 +00:00
parent 352c6ba4ba
commit ad4d73ea0d
2 changed files with 103 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
View File

@@ -8,12 +8,9 @@ import net.i2p.apps.systray.UrlLauncher;
import net.i2p.router.Router; import net.i2p.router.Router;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import net.i2p.router.startup.ClientAppConfig; import net.i2p.router.startup.ClientAppConfig;
import net.i2p.util.Log; import net.i2p.util.VersionComparator;
import org.tanukisoftware.wrapper.WrapperManager; import org.tanukisoftware.wrapper.WrapperManager;
import org.tanukisoftware.wrapper.event.WrapperControlEvent;
import org.tanukisoftware.wrapper.event.WrapperEvent;
import org.tanukisoftware.wrapper.event.WrapperEventListener;
/** /**
* Handler to deal with form submissions from the service config form and act * Handler to deal with form submissions from the service config form and act
@@ -22,9 +19,9 @@ import org.tanukisoftware.wrapper.event.WrapperEventListener;
*/ */
public class ConfigServiceHandler extends FormHandler { public class ConfigServiceHandler extends FormHandler {
private static WrapperEventListener _signalHandler; private static WrapperListener _wrapperListener;
private static final String PROP_GRACEFUL_HUP = "router.gracefulHUP"; private static final String LISTENER_AVAILABLE = "3.2.0";
/** /**
* Register two shutdown hooks, one to rekey and/or tell the wrapper we are stopping, * Register two shutdown hooks, one to rekey and/or tell the wrapper we are stopping,
@@ -137,16 +134,19 @@ public class ConfigServiceHandler extends FormHandler {
/** /**
* Register a handler for signals, * Register a handler for signals,
* so we can handle HUP from the wrapper (non-Windows only) * so we can handle HUP from the wrapper (non-Windows only, wrapper 3.2.0 or higher)
* *
* @since 0.8.13 * @since 0.8.13
*/ */
synchronized static void registerSignalHandler(RouterContext ctx) { synchronized static void registerSignalHandler(RouterContext ctx) {
if (ctx.hasWrapper() && _signalHandler == null && if (ctx.hasWrapper() && _wrapperListener == null &&
!System.getProperty("os.name").startsWith("Win")) { !System.getProperty("os.name").startsWith("Win")) {
_signalHandler = new SignalHandler(ctx); String wv = System.getProperty("wrapper.version");
long mask = WrapperEventListener.EVENT_FLAG_CONTROL; if (wv != null && (new VersionComparator()).compare(wv, LISTENER_AVAILABLE) >= 0) {
WrapperManager.addWrapperEventListener(_signalHandler, mask); try {
_wrapperListener = new WrapperListener(ctx);
} catch (Throwable t) {}
}
} }
} }
@@ -156,55 +156,9 @@ public class ConfigServiceHandler extends FormHandler {
* @since 0.8.13 * @since 0.8.13
*/ */
public synchronized static void unregisterSignalHandler() { public synchronized static void unregisterSignalHandler() {
if (_signalHandler != null) { if (_wrapperListener != null) {
WrapperManager.removeWrapperEventListener(_signalHandler); _wrapperListener.unregister();
_signalHandler = null; _wrapperListener = null;
}
}
/**
* Catch signals.
* The wrapper will potentially forward HUP, USR1, and USR2.
* But USR1 and USR2 are used by the JVM GC and cannot be trapped.
* So we will only get HUP.
*
* @since 0.8.13
*/
private static class SignalHandler implements WrapperEventListener {
private final RouterContext _ctxt;
public SignalHandler(RouterContext ctx) {
_ctxt = ctx;
}
public void fired(WrapperEvent event) {
if (!(event instanceof WrapperControlEvent))
return;
WrapperControlEvent wce = (WrapperControlEvent) event;
Log log = _ctxt.logManager().getLog(ConfigServiceHandler.class);
if (log.shouldLog(Log.WARN))
log.warn("Got signal: " + wce.getControlEventName());
int sig = wce.getControlEvent();
switch (sig) {
case WrapperManager.WRAPPER_CTRL_HUP_EVENT:
if (_ctxt.getBooleanProperty(PROP_GRACEFUL_HUP)) {
wce.consume();
if (!(_ctxt.router().gracefulShutdownInProgress() ||
_ctxt.router().isFinalShutdownInProgress())) {
System.err.println("WARN: Graceful shutdown initiated by SIGHUP");
log.logAlways(Log.WARN, "Graceful shutdown initiated by SIGHUP");
registerWrapperNotifier(_ctxt, Router.EXIT_GRACEFUL, false);
_ctxt.router().shutdownGracefully();
}
} else {
log.log(Log.CRIT, "Hard shutdown initiated by SIGHUP");
// JVM will call ShutdownHook if we don't do it ourselves
//wce.consume();
//registerWrapperNotifier(_ctxt, Router.EXIT_HARD, false);
//_ctxt.router().shutdown(Router.EXIT_HARD);
}
break;
}
} }
} }

89
apps/routerconsole/java/src/net/i2p/router/web/WrapperListener.java Normal file
View File

@@ -0,0 +1,89 @@
package net.i2p.router.web;
import net.i2p.router.Router;
import net.i2p.router.RouterContext;
import net.i2p.util.Log;
import org.tanukisoftware.wrapper.WrapperManager;
import org.tanukisoftware.wrapper.event.WrapperControlEvent;
import org.tanukisoftware.wrapper.event.WrapperEvent;
import org.tanukisoftware.wrapper.event.WrapperEventListener;
/**
* Listen for events. Requires wrapper 3.2.0 or higher.
* Hides the actual listener so that
* ConfigServiceHandler can have a static field and not die on
* class not found error with wrapper 3.1.1.
*
* @since 0.8.13
*/
class WrapperListener {
private final RouterContext _context;
private final WrapperEventListener _listener;
private static final String PROP_GRACEFUL_HUP = "router.gracefulHUP";
/**
* Wrapper must be 3.2.0 or higher, or will throw class not found error.
* Registers with the wrapper in the constructor.
*/
public WrapperListener(RouterContext ctx) {
_context = ctx;
_listener = new SignalHandler(ctx);
long mask = WrapperEventListener.EVENT_FLAG_CONTROL;
WrapperManager.addWrapperEventListener(_listener, mask);
}
/**
* Unregister the handler for signals
*/
public void unregister() {
WrapperManager.removeWrapperEventListener(_listener);
}
/**
* Catch signals.
* The wrapper will potentially forward HUP, USR1, and USR2.
* But USR1 and USR2 are used by the JVM GC and cannot be trapped.
* So we will only get HUP.
*
* @since 0.8.13
*/
private static class SignalHandler implements WrapperEventListener {
private final RouterContext _ctxt;
public SignalHandler(RouterContext ctx) {
_ctxt = ctx;
}
public void fired(WrapperEvent event) {
if (!(event instanceof WrapperControlEvent))
return;
WrapperControlEvent wce = (WrapperControlEvent) event;
Log log = _ctxt.logManager().getLog(ConfigServiceHandler.class);
if (log.shouldLog(Log.WARN))
log.warn("Got signal: " + wce.getControlEventName());
int sig = wce.getControlEvent();
switch (sig) {
case WrapperManager.WRAPPER_CTRL_HUP_EVENT:
if (_ctxt.getBooleanPropertyDefaultTrue(PROP_GRACEFUL_HUP)) {
wce.consume();
if (!(_ctxt.router().gracefulShutdownInProgress() ||
_ctxt.router().isFinalShutdownInProgress())) {
System.err.println("WARN: Graceful shutdown initiated by SIGHUP");
log.logAlways(Log.WARN, "Graceful shutdown initiated by SIGHUP");
ConfigServiceHandler.registerWrapperNotifier(_ctxt, Router.EXIT_GRACEFUL, false);
_ctxt.router().shutdownGracefully();
}
} else {
log.log(Log.CRIT, "Hard shutdown initiated by SIGHUP");
// JVM will call ShutdownHook if we don't do it ourselves
//wce.consume();
//registerWrapperNotifier(_ctxt, Router.EXIT_HARD, false);
//_ctxt.router().shutdown(Router.EXIT_HARD);
}
break;
}
}
}
}