Repository: karaf Updated Branches: refs/heads/karaf-2.x 9d10031a8 -> 45c3e4096
[KARAF-3112]make stopTimeout of AdminService configurable Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f6ebe33c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f6ebe33c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f6ebe33c Branch: refs/heads/karaf-2.x Commit: f6ebe33c719c2c230d2d281a5e154862e4d56dd0 Parents: 7ba6261 Author: Freeman Fang <[email protected]> Authored: Fri Jul 11 17:38:33 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Fri Jul 11 17:38:33 2014 +0800 ---------------------------------------------------------------------- .../java/org/apache/karaf/admin/internal/AdminServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f6ebe33c/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java ---------------------------------------------------------------------- diff --git a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java index 9e0c7d5..ba995f9 100644 --- a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java +++ b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java @@ -74,6 +74,8 @@ public class AdminServiceImpl implements AdminService { private static final String KARAF_SHUTDOWN_COMMAND = "karaf.shutdown.command"; private static final String KARAF_SHUTDOWN_PID_FILE = "karaf.shutdown.pid.file"; + + private static final String KARAF_SHUTDOWN_TIMEOUT = "karaf.shutdown.timeout"; private static final String DEFAULT_SHUTDOWN_COMMAND = "SHUTDOWN"; @@ -657,7 +659,9 @@ public class AdminServiceImpl implements AdminService { Socket s = new Socket(host, port); s.getOutputStream().write(shutdown.getBytes()); s.close(); - long t = System.currentTimeMillis() + getStopTimeout(); + long stopTimeout = Long.parseLong(props.getProperty(KARAF_SHUTDOWN_TIMEOUT, + Long.toString(getStopTimeout()))); + long t = System.currentTimeMillis() + stopTimeout; do { Thread.sleep(100); checkPid(instance);
