You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2014/07/11 11:44:47 UTC
git commit: [KARAF-3112]make stopTimeout of AdminService configurable
(cherry picked from commit f6ebe33c719c2c230d2d281a5e154862e4d56dd0)
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 65e1457f7 -> bb9c1473c
[KARAF-3112]make stopTimeout of AdminService configurable
(cherry picked from commit f6ebe33c719c2c230d2d281a5e154862e4d56dd0)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bb9c1473
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bb9c1473
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bb9c1473
Branch: refs/heads/karaf-3.0.x
Commit: bb9c1473c19904d38553c5181ee85c31f6974d22
Parents: 65e1457
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Jul 11 17:38:33 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Jul 11 17:43:11 2014 +0800
----------------------------------------------------------------------
.../karaf/instance/core/internal/InstanceServiceImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bb9c1473/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index 8171f18..730298c 100644
--- a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -68,6 +68,8 @@ public class InstanceServiceImpl implements InstanceService {
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";
@@ -678,7 +680,9 @@ public class InstanceServiceImpl implements InstanceService {
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);