echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c57552f4e924d7cf2ae85cb83c61eae943e10bbf
i2p.i2p/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

269 lines
9.7 KiB
Java
Raw Normal View History

* new configservice.jsp page that shuts down the router (and has hooks for a few other things) * new safer way of shutting down the router per discussions with oOo (dealing with a graceful shutdown where the user updates their config before the shutdown is complete, etc) * graceful shutdown implemented in the router - shutdownGracefully(), cancelGracefulShutdown(), shutdownInProgress()
2004-08-23 07:33:14 +00:00
package net.i2p.router.web;
* Console: Add full file path to thread dump message
2012-05-20 18:12:41 +00:00
import java.io.File;
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
import java.io.IOException;
clean up and fix the possibly broken browser launcher config
2009-01-02 20:09:20 +00:00
import java.util.List;
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
2004-11-25 jrandom * Revised the installer to include start menu and desktop shortcuts for windows platforms, including pretty icons (thanks DrWoo!) * Allow clients specified in clients.config to have an explicit startup delay. * Update the default install to launch a browser pointing at the console whenever I2P starts up, rather than only the first time it starts up (configurable on /configservice.jsp, or in clients.config) * Bugfix to the clock skew checking code to monitor the delta between offsets, not the offset itself (duh) * Router console html update * New (and uuuuugly) code to verify that the wrapper.config contains the necessary classpath entries on update. If it has to update the wrapper.config, it will stop the JVM and service completely, since the java service wrapper doesn't reread the wrapper.config on JVM restart - requiring the user to manually restart the service after an update. * Increase the TCP connection timeout to 30s (which is obscenely long) ------------------------------------------------
2004-11-25 21:57:19 +00:00
import net.i2p.apps.systray.UrlLauncher;
Cleaned up all 'imports' in all applications, core and router.
2008-07-16 13:42:54 +00:00
import net.i2p.router.Router;
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
import net.i2p.router.RouterContext;
clean up and fix the possibly broken browser launcher config
2009-01-02 20:09:20 +00:00
import net.i2p.router.startup.ClientAppConfig;
* RouterConsoleRunner: - Prep for ClientApp interface by storing context in a field, shuffle around what's static and what's not (ticket #347) - Remove ports from port mapper on shutdown, other changes to track actual ports better (ticket #731) - Hook in password manager using MD5, untested. (ticket #731)
2012-10-13 13:06:22 +00:00
import net.i2p.util.PortMapper;
* SystemVersion: New util, to consolidate duplicate code, and determine Java version on Android
2012-09-09 15:40:14 +00:00
import net.i2p.util.SystemVersion;
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
import net.i2p.util.VersionComparator;
Cleaned up all 'imports' in all applications, core and router.
2008-07-16 13:42:54 +00:00
* add "dump threads" * hook in to the service manager and let it know we're exiting gracefully (when appropriate) * commented out but generally functional systray integration. i cant get it to build sometimes though, something is b0rking up
2004-08-23 21:32:24 +00:00
import org.tanukisoftware.wrapper.WrapperManager;
* new configservice.jsp page that shuts down the router (and has hooks for a few other things) * new safer way of shutting down the router per discussions with oOo (dealing with a graceful shutdown where the user updates their config before the shutdown is complete, etc) * graceful shutdown implemented in the router - shutdownGracefully(), cancelGracefulShutdown(), shutdownInProgress()
2004-08-23 07:33:14 +00:00
/**
* Handler to deal with form submissions from the service config form and act
* upon the values.
*
*/
public class ConfigServiceHandler extends FormHandler {
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
private static WrapperListener _wrapperListener;
* Router shutdown: - Fix failsafe shutdown hook broken in 0.8.8; HUP, INT, and TERM signals should now shut down cleanly. - Shutdown hook no longer prevents other hooks from running - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown. Only under wrapper, non-Windows. - i2prouter stop now uses SIGTERM - Implement i2prouter graceful using SIGHUP (ticket #580) - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down or crash the JVM
2012-01-08 13:15:47 +00:00
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
private static final String LISTENER_AVAILABLE = "3.2.0";
* Router shutdown: - Fix failsafe shutdown hook broken in 0.8.8; HUP, INT, and TERM signals should now shut down cleanly. - Shutdown hook no longer prevents other hooks from running - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown. Only under wrapper, non-Windows. - i2prouter stop now uses SIGTERM - Implement i2prouter graceful using SIGHUP (ticket #580) - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down or crash the JVM
2012-01-08 13:15:47 +00:00
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
/**
* Register two shutdown hooks, one to rekey and/or tell the wrapper we are stopping,
* and a final one to tell the wrapper we are stopped.
*
* @since 0.8.8
*/
private void registerWrapperNotifier(int code, boolean rekey) {
registerWrapperNotifier(_context, code, rekey);
}
/**
* Register two shutdown hooks, one to rekey and/or tell the wrapper we are stopping,
* and a final one to tell the wrapper we are stopped.
*
* @since 0.8.8
*/
public static void registerWrapperNotifier(RouterContext ctx, int code, boolean rekey) {
Runnable task = new UpdateWrapperOrRekeyTask(rekey, ctx.hasWrapper());
ctx.addShutdownTask(task);
if (ctx.hasWrapper()) {
task = new FinalWrapperTask(code);
ctx.addFinalShutdownTask(task);
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
}
/**
* Rekey and/or tell the wrapper we are stopping,
*/
private static class UpdateWrapperOrRekeyTask implements Runnable {
private final boolean _rekey;
private final boolean _tellWrapper;
private static final int HASHCODE = -123999871;
private static final int WAIT = 30*1000;
public UpdateWrapperOrRekeyTask(boolean rekey, boolean tellWrapper) {
_rekey = rekey;
_tellWrapper = tellWrapper;
}
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
public void run() {
try {
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
if (_rekey)
ContextHelper.getContext(null).router().killKeys();
if (_tellWrapper)
WrapperManager.signalStopping(WAIT);
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
} catch (Throwable t) {
t.printStackTrace();
}
}
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
/**
* Make them all look the same since the hooks are stored in a set
* and we don't want dups
*/
@Override
public int hashCode() {
return HASHCODE;
}
/**
* Make them all look the same since the hooks are stored in a set
* and we don't want dups
*/
@Override
public boolean equals(Object o) {
return (o != null) && (o instanceof UpdateWrapperOrRekeyTask);
}
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
2005-11-26 Raccoon23 * Added support for 'dynamic keys' mode, where the router creates a new router identity whenever it detects a substantial change in its public address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new router address would not be shitlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended.
2005-11-26 09:16:11 +00:00
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
/**
* Tell the wrapper we are stopped.
*
* @since 0.8.8
*/
private static class FinalWrapperTask implements Runnable {
private final int _exitCode;
private static final int HASHCODE = 123999871;
public FinalWrapperTask(int exitCode) {
2005-11-26 Raccoon23 * Added support for 'dynamic keys' mode, where the router creates a new router identity whenever it detects a substantial change in its public address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new router address would not be shitlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended.
2005-11-26 09:16:11 +00:00
_exitCode = exitCode;
}
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
2005-11-26 Raccoon23 * Added support for 'dynamic keys' mode, where the router creates a new router identity whenever it detects a substantial change in its public address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new router address would not be shitlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended.
2005-11-26 09:16:11 +00:00
public void run() {
try {
WrapperManager.signalStopped(_exitCode);
} catch (Throwable t) {
t.printStackTrace();
}
}
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
/**
* Make them all look the same since the hooks are stored in a set
* and we don't want dups
*/
@Override
public int hashCode() {
return HASHCODE;
}
/**
* Make them all look the same since the hooks are stored in a set
* and we don't want dups
*/
@Override
public boolean equals(Object o) {
return (o != null) && (o instanceof FinalWrapperTask);
}
2005-11-26 Raccoon23 * Added support for 'dynamic keys' mode, where the router creates a new router identity whenever it detects a substantial change in its public address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new router address would not be shitlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended.
2005-11-26 09:16:11 +00:00
}
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
* Router shutdown: - Fix failsafe shutdown hook broken in 0.8.8; HUP, INT, and TERM signals should now shut down cleanly. - Shutdown hook no longer prevents other hooks from running - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown. Only under wrapper, non-Windows. - i2prouter stop now uses SIGTERM - Implement i2prouter graceful using SIGHUP (ticket #580) - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down or crash the JVM
2012-01-08 13:15:47 +00:00
/**
* Register a handler for signals,
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
* so we can handle HUP from the wrapper (non-Windows only, wrapper 3.2.0 or higher)
* Router shutdown: - Fix failsafe shutdown hook broken in 0.8.8; HUP, INT, and TERM signals should now shut down cleanly. - Shutdown hook no longer prevents other hooks from running - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown. Only under wrapper, non-Windows. - i2prouter stop now uses SIGTERM - Implement i2prouter graceful using SIGHUP (ticket #580) - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down or crash the JVM
2012-01-08 13:15:47 +00:00
*
* @since 0.8.13
*/
synchronized static void registerSignalHandler(RouterContext ctx) {
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
if (ctx.hasWrapper() && _wrapperListener == null &&
* SystemVersion: New util, to consolidate duplicate code, and determine Java version on Android
2012-09-09 15:40:14 +00:00
!SystemVersion.isWindows()) {
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
String wv = System.getProperty("wrapper.version");
* DatabaseLookupmessage: - Add support for requesting an encrypted reply * NetDB: - Add support for encrypted DatabaseSearchReplyMessage and DatabaseStoreMessage in response to a DatabaseLookupMessage * PRNG: Cleanups using Collections.singletonMap() * Router utils: New RemovableSingletonSet * TransientSessionKeyManager: - Support variable expiration for inbound tag sets - Several efficiency improvements * VersionComparator: Add static method, use most places
2013-05-26 17:25:02 +00:00
if (wv != null && VersionComparator.comp(wv, LISTENER_AVAILABLE) >= 0) {
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
try {
_wrapperListener = new WrapperListener(ctx);
} catch (Throwable t) {}
}
* Router shutdown: - Fix failsafe shutdown hook broken in 0.8.8; HUP, INT, and TERM signals should now shut down cleanly. - Shutdown hook no longer prevents other hooks from running - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown. Only under wrapper, non-Windows. - i2prouter stop now uses SIGTERM - Implement i2prouter graceful using SIGHUP (ticket #580) - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down or crash the JVM
2012-01-08 13:15:47 +00:00
}
}
/**
* Unregister the handler for signals
*
* @since 0.8.13
*/
public synchronized static void unregisterSignalHandler() {
- Fix class error on wrapper 3.1.1
2012-01-09 23:59:58 +00:00
if (_wrapperListener != null) {
_wrapperListener.unregister();
_wrapperListener = null;
* Router shutdown: - Fix failsafe shutdown hook broken in 0.8.8; HUP, INT, and TERM signals should now shut down cleanly. - Shutdown hook no longer prevents other hooks from running - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown. Only under wrapper, non-Windows. - i2prouter stop now uses SIGTERM - Implement i2prouter graceful using SIGHUP (ticket #580) - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down or crash the JVM
2012-01-08 13:15:47 +00:00
}
}
HTML bugfixes in routerconsole pages.
2009-08-15 16:08:33 +00:00
@Override
* new configservice.jsp page that shuts down the router (and has hooks for a few other things) * new safer way of shutting down the router per discussions with oOo (dealing with a graceful shutdown where the user updates their config before the shutdown is complete, etc) * graceful shutdown implemented in the router - shutdownGracefully(), cancelGracefulShutdown(), shutdownInProgress()
2004-08-23 07:33:14 +00:00
protected void processForm() {
if (_action == null) return;
standardized the spoof prevention: - set the nonce and noncePrev for the handler when rendering the form - include the current nonce in the hidden parameter "nonce" - include an "action" parameter (so we know we want to execute something and hence, validate the nonce, rather than just display the page) - if the nonce submitted doesnt match what is set in the nonce or noncePrev when validating, its invalid. refuse to process
2004-08-23 17:11:38 +00:00
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
if (_("Shutdown gracefully").equals(_action)) {
* AppContext: Add hasWrapper() method * Shutdown: - Clear more resources in peer manager, netdb, stat manager, session key manager, naming service, tunnel dispatcher, OCMOSJ (result of testing with jvisualvm) - Don't call wrapper on shutdown (starting two threads) if we were started with runplain
2011-07-03 13:46:29 +00:00
if (_context.hasWrapper())
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
registerWrapperNotifier(Router.EXIT_GRACEFUL, false);
* new configservice.jsp page that shuts down the router (and has hooks for a few other things) * new safer way of shutting down the router per discussions with oOo (dealing with a graceful shutdown where the user updates their config before the shutdown is complete, etc) * graceful shutdown implemented in the router - shutdownGracefully(), cancelGracefulShutdown(), shutdownInProgress()
2004-08-23 07:33:14 +00:00
_context.router().shutdownGracefully();
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Graceful shutdown initiated"));
} else if (_("Shutdown immediately").equals(_action)) {
* AppContext: Add hasWrapper() method * Shutdown: - Clear more resources in peer manager, netdb, stat manager, session key manager, naming service, tunnel dispatcher, OCMOSJ (result of testing with jvisualvm) - Don't call wrapper on shutdown (starting two threads) if we were started with runplain
2011-07-03 13:46:29 +00:00
if (_context.hasWrapper())
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
registerWrapperNotifier(Router.EXIT_HARD, false);
* add "dump threads" * hook in to the service manager and let it know we're exiting gracefully (when appropriate) * commented out but generally functional systray integration. i cant get it to build sometimes though, something is b0rking up
2004-08-23 21:32:24 +00:00
_context.router().shutdown(Router.EXIT_HARD);
boom bye bye bad bwoy
2013-06-12 13:45:27 +00:00
addFormNotice(_("Shutdown immediately"));
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
} else if (_("Cancel graceful shutdown").equals(_action)) {
* new configservice.jsp page that shuts down the router (and has hooks for a few other things) * new safer way of shutting down the router per discussions with oOo (dealing with a graceful shutdown where the user updates their config before the shutdown is complete, etc) * graceful shutdown implemented in the router - shutdownGracefully(), cancelGracefulShutdown(), shutdownInProgress()
2004-08-23 07:33:14 +00:00
_context.router().cancelGracefulShutdown();
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Graceful shutdown cancelled"));
} else if (_("Graceful restart").equals(_action)) {
* AppContext: Add hasWrapper() method * Shutdown: - Clear more resources in peer manager, netdb, stat manager, session key manager, naming service, tunnel dispatcher, OCMOSJ (result of testing with jvisualvm) - Don't call wrapper on shutdown (starting two threads) if we were started with runplain
2011-07-03 13:46:29 +00:00
// should have wrapper if restart button is visible
if (_context.hasWrapper())
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
registerWrapperNotifier(Router.EXIT_GRACEFUL_RESTART, false);
2004-09-06 jrandom * Address a race condition in the key management code that would manifest itself as a corrupt router identity. * Properly clear old transport addresses from being displayed on the old console after soft restarts. * Properly refuse to load the client applications more than once in the same JVM. * Added support for a graceful restart (a graceful shutdown followed by a full JVM restart - useful for restarting client apps). * More defensive programming, HTML cleanup, logging * wrapper.config cleanup of duplicate lines
2004-09-06 05:20:40 +00:00
_context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Graceful restart requested"));
} else if (_("Hard restart").equals(_action)) {
* AppContext: Add hasWrapper() method * Shutdown: - Clear more resources in peer manager, netdb, stat manager, session key manager, naming service, tunnel dispatcher, OCMOSJ (result of testing with jvisualvm) - Don't call wrapper on shutdown (starting two threads) if we were started with runplain
2011-07-03 13:46:29 +00:00
// should have wrapper if restart button is visible
if (_context.hasWrapper())
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
registerWrapperNotifier(Router.EXIT_HARD_RESTART, false);
* helper to read the last few lines of a textfile * use that to render the last few lines of the wrapper log on /logs.jsp (for the on demand stack trace) * thread creation / finalization logging * support a hard restart (stop immediately and restart the JVM) - useful for rerunning clients.config (etc) * systray when not supported
2004-08-24 18:02:48 +00:00
_context.router().shutdown(Router.EXIT_HARD_RESTART);
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Hard restart requested"));
} else if (_("Rekey and Restart").equals(_action)) {
addFormNotice(_("Rekeying after graceful restart"));
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
registerWrapperNotifier(Router.EXIT_GRACEFUL_RESTART, true);
2005-11-26 Raccoon23 * Added support for 'dynamic keys' mode, where the router creates a new router identity whenever it detects a substantial change in its public address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new router address would not be shitlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended.
2005-11-26 09:16:11 +00:00
_context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
} else if (_("Rekey and Shutdown").equals(_action)) {
addFormNotice(_("Rekeying after graceful shutdown"));
* Shutdown: - Cancel our JVM shutdown hook when shutting down - Run a spinner task so shutdown always completes - exit() instead of halt() so other JVM shutdown hooks run - Prevent duplicate wrapper notifier hooks - Notify the wrapper twice, once for stopping and once for stopped
2011-07-15 01:13:35 +00:00
registerWrapperNotifier(Router.EXIT_GRACEFUL, true);
2005-11-26 Raccoon23 * Added support for 'dynamic keys' mode, where the router creates a new router identity whenever it detects a substantial change in its public address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new router address would not be shitlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended.
2005-11-26 09:16:11 +00:00
_context.router().shutdownGracefully(Router.EXIT_GRACEFUL);
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
} else if (_("Run I2P on startup").equals(_action)) {
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
installService();
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
} else if (_("Don't run I2P on startup").equals(_action)) {
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
uninstallService();
* Console: - Don't save config when checking for updates on configupdate.jsp - Rework ConfigRestartBean and tag - More tag fixups - Add lang=xx for testing - Add file for additional tagged strings
2009-10-26 21:48:46 +00:00
} else if (_("Dump threads").equals(_action)) {
crazy paranoia to deal with errors referencing bad dll/.so files for the service wrapper / systray / etc
2004-08-26 03:12:52 +00:00
try {
WrapperManager.requestThreadDump();
} catch (Throwable t) {
addFormError("Warning: unable to contact the service manager - " + t.getMessage());
}
* Console: Add full file path to thread dump message
2012-05-20 18:12:41 +00:00
File wlog = LogsHelper.wrapperLogFile(_context);
addFormNotice(_("Threads dumped to {0}", wlog.getAbsolutePath()));
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
} else if (_("View console on startup").equals(_action)) {
2004-11-25 jrandom * Revised the installer to include start menu and desktop shortcuts for windows platforms, including pretty icons (thanks DrWoo!) * Allow clients specified in clients.config to have an explicit startup delay. * Update the default install to launch a browser pointing at the console whenever I2P starts up, rather than only the first time it starts up (configurable on /configservice.jsp, or in clients.config) * Bugfix to the clock skew checking code to monitor the delta between offsets, not the offset itself (duh) * Router console html update * New (and uuuuugly) code to verify that the wrapper.config contains the necessary classpath entries on update. If it has to update the wrapper.config, it will stop the JVM and service completely, since the java service wrapper doesn't reread the wrapper.config on JVM restart - requiring the user to manually restart the service after an update. * Increase the TCP connection timeout to 30s (which is obscenely long) ------------------------------------------------
2004-11-25 21:57:19 +00:00
browseOnStartup(true);
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Console is to be shown on startup"));
} else if (_("Do not view console on startup").equals(_action)) {
2004-11-25 jrandom * Revised the installer to include start menu and desktop shortcuts for windows platforms, including pretty icons (thanks DrWoo!) * Allow clients specified in clients.config to have an explicit startup delay. * Update the default install to launch a browser pointing at the console whenever I2P starts up, rather than only the first time it starts up (configurable on /configservice.jsp, or in clients.config) * Bugfix to the clock skew checking code to monitor the delta between offsets, not the offset itself (duh) * Router console html update * New (and uuuuugly) code to verify that the wrapper.config contains the necessary classpath entries on update. If it has to update the wrapper.config, it will stop the JVM and service completely, since the java service wrapper doesn't reread the wrapper.config on JVM restart - requiring the user to manually restart the service after an update. * Increase the TCP connection timeout to 30s (which is obscenely long) ------------------------------------------------
2004-11-25 21:57:19 +00:00
browseOnStartup(false);
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Console is not to be shown on startup"));
* configservice.jsp: Add GC button
2012-10-05 13:09:34 +00:00
} else if (_("Force GC").equals(_action)) {
Runtime.getRuntime().gc();
addFormNotice(_("Full garbage collection requested"));
* new configservice.jsp page that shuts down the router (and has hooks for a few other things) * new safer way of shutting down the router per discussions with oOo (dealing with a graceful shutdown where the user updates their config before the shutdown is complete, etc) * graceful shutdown implemented in the router - shutdownGracefully(), cancelGracefulShutdown(), shutdownInProgress()
2004-08-23 07:33:14 +00:00
} else {
2006-02-15 jrandom * Merged in the i2p_0_6_1_10_PRE branch to the trunk, so CVS HEAD is no longer backwards compatible (and should not be used until 0.6.1.1 is out)
2006-02-15 05:33:17 +00:00
//addFormNotice("Blah blah blah. whatever. I'm not going to " + _action);
* new configservice.jsp page that shuts down the router (and has hooks for a few other things) * new safer way of shutting down the router per discussions with oOo (dealing with a graceful shutdown where the user updates their config before the shutdown is complete, etc) * graceful shutdown implemented in the router - shutdownGracefully(), cancelGracefulShutdown(), shutdownInProgress()
2004-08-23 07:33:14 +00:00
}
}
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
private void installService() {
try {
Runtime.getRuntime().exec("install_i2p_service_winnt.bat");
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Service installed"));
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
} catch (IOException ioe) {
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormError(_("Warning: unable to install the service") + " - " + ioe.getMessage());
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
}
}
* Router shutdown: - Fix failsafe shutdown hook broken in 0.8.8; HUP, INT, and TERM signals should now shut down cleanly. - Shutdown hook no longer prevents other hooks from running - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown. Only under wrapper, non-Windows. - i2prouter stop now uses SIGTERM - Implement i2prouter graceful using SIGHUP (ticket #580) - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down or crash the JVM
2012-01-08 13:15:47 +00:00
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
private void uninstallService() {
try {
Runtime.getRuntime().exec("uninstall_i2p_service_winnt.bat");
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormNotice(_("Service removed"));
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
} catch (IOException ioe) {
Tagged buttons and message on conf- Net,Service,Update,Client update Translation
2009-10-26 02:21:15 +00:00
addFormError(_("Warning: unable to remove the service") + " - " + ioe.getMessage());
let windows users install/remove the service through the /configservice.jsp page
2004-08-31 21:25:23 +00:00
}
}
2004-11-25 jrandom * Revised the installer to include start menu and desktop shortcuts for windows platforms, including pretty icons (thanks DrWoo!) * Allow clients specified in clients.config to have an explicit startup delay. * Update the default install to launch a browser pointing at the console whenever I2P starts up, rather than only the first time it starts up (configurable on /configservice.jsp, or in clients.config) * Bugfix to the clock skew checking code to monitor the delta between offsets, not the offset itself (duh) * Router console html update * New (and uuuuugly) code to verify that the wrapper.config contains the necessary classpath entries on update. If it has to update the wrapper.config, it will stop the JVM and service completely, since the java service wrapper doesn't reread the wrapper.config on JVM restart - requiring the user to manually restart the service after an update. * Increase the TCP connection timeout to 30s (which is obscenely long) ------------------------------------------------
2004-11-25 21:57:19 +00:00
private void browseOnStartup(boolean shouldLaunchBrowser) {
routerconsole: type arguments, unused imports
2013-11-21 11:31:50 +00:00
List<ClientAppConfig> clients = ClientAppConfig.getClientApps(_context);
clean up and fix the possibly broken browser launcher config
2009-01-02 20:09:20 +00:00
boolean found = false;
for (int cur = 0; cur < clients.size(); cur++) {
routerconsole: type arguments, unused imports
2013-11-21 11:31:50 +00:00
ClientAppConfig ca = clients.get(cur);
clean up and fix the possibly broken browser launcher config
2009-01-02 20:09:20 +00:00
if (UrlLauncher.class.getName().equals(ca.className)) {
ca.disabled = !shouldLaunchBrowser;
found = true;
break;
2004-11-25 jrandom * Revised the installer to include start menu and desktop shortcuts for windows platforms, including pretty icons (thanks DrWoo!) * Allow clients specified in clients.config to have an explicit startup delay. * Update the default install to launch a browser pointing at the console whenever I2P starts up, rather than only the first time it starts up (configurable on /configservice.jsp, or in clients.config) * Bugfix to the clock skew checking code to monitor the delta between offsets, not the offset itself (duh) * Router console html update * New (and uuuuugly) code to verify that the wrapper.config contains the necessary classpath entries on update. If it has to update the wrapper.config, it will stop the JVM and service completely, since the java service wrapper doesn't reread the wrapper.config on JVM restart - requiring the user to manually restart the service after an update. * Increase the TCP connection timeout to 30s (which is obscenely long) ------------------------------------------------
2004-11-25 21:57:19 +00:00
}
}
clean up and fix the possibly broken browser launcher config
2009-01-02 20:09:20 +00:00
// releases <= 0.6.5 deleted the entry completely
if (shouldLaunchBrowser && !found) {
* RouterConsoleRunner: - Prep for ClientApp interface by storing context in a field, shuffle around what's static and what's not (ticket #347) - Remove ports from port mapper on shutdown, other changes to track actual ports better (ticket #731) - Hook in password manager using MD5, untested. (ticket #731)
2012-10-13 13:06:22 +00:00
int port = _context.portMapper().getPort(PortMapper.SVC_CONSOLE, RouterConsoleRunner.DEFAULT_LISTEN_PORT);
ClientAppConfig ca = new ClientAppConfig(UrlLauncher.class.getName(), "consoleBrowser",
"http://127.0.0.1:" + port + '/', 5, false);
clean up and fix the possibly broken browser launcher config
2009-01-02 20:09:20 +00:00
clients.add(ca);
}
ClientAppConfig.writeClientAppConfig(_context, clients);
2004-11-25 jrandom * Revised the installer to include start menu and desktop shortcuts for windows platforms, including pretty icons (thanks DrWoo!) * Allow clients specified in clients.config to have an explicit startup delay. * Update the default install to launch a browser pointing at the console whenever I2P starts up, rather than only the first time it starts up (configurable on /configservice.jsp, or in clients.config) * Bugfix to the clock skew checking code to monitor the delta between offsets, not the offset itself (duh) * Router console html update * New (and uuuuugly) code to verify that the wrapper.config contains the necessary classpath entries on update. If it has to update the wrapper.config, it will stop the JVM and service completely, since the java service wrapper doesn't reread the wrapper.config on JVM restart - requiring the user to manually restart the service after an update. * Increase the TCP connection timeout to 30s (which is obscenely long) ------------------------------------------------
2004-11-25 21:57:19 +00:00
}
2005-11-26 Raccoon23 * Added support for 'dynamic keys' mode, where the router creates a new router identity whenever it detects a substantial change in its public address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new router address would not be shitlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended.
2005-11-26 09:16:11 +00:00
}
Reference in New Issue Copy Permalink