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

* Wrapper: Fix failed restarts on ARM (ticket #1230);

Browse Source 
extend shutdown timeouts for all archs.
This commit is contained in:
zzz
2014-03-12 12:33:36 +00:00
parent c57552f4e9
commit 5283fc923e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package net.i2p.router.web;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Properties;
import net.i2p.apps.systray.UrlLauncher; import net.i2p.apps.systray.UrlLauncher;
import net.i2p.router.Router; import net.i2p.router.Router;
@ -57,7 +58,8 @@ public class ConfigServiceHandler extends FormHandler {
private final boolean _rekey; private final boolean _rekey;
private final boolean _tellWrapper; private final boolean _tellWrapper;
private static final int HASHCODE = -123999871; private static final int HASHCODE = -123999871;
private static final int WAIT = 30*1000; // RPi takes a long time to write out the peer profiles
private static final int WAIT = SystemVersion.isARM() ? 4*60*1000 : 2*60*1000;
public UpdateWrapperOrRekeyTask(boolean rekey, boolean tellWrapper) { public UpdateWrapperOrRekeyTask(boolean rekey, boolean tellWrapper) {
_rekey = rekey; _rekey = rekey;
@ -68,8 +70,19 @@ public class ConfigServiceHandler extends FormHandler {
try { try {
if (_rekey) if (_rekey)
ContextHelper.getContext(null).router().killKeys(); ContextHelper.getContext(null).router().killKeys();
if (_tellWrapper) if (_tellWrapper) {
WrapperManager.signalStopping(WAIT); int wait = WAIT;
Properties props = WrapperManager.getProperties();
String tmout = props.getProperty("wrapper.jvm_exit.timeout");
if (tmout != null) {
try {
int cwait = Integer.parseInt(tmout) * 1000;
if (cwait > wait)
wait = cwait;
} catch (NumberFormatException nfe) {}
}
WrapperManager.signalStopping(wait);
}
} catch (Throwable t) { } catch (Throwable t) {
t.printStackTrace(); t.printStackTrace();
} }