You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/07/19 16:26:24 UTC
[16/32] git commit: Only shutdown on specific tasks
Only shutdown on specific tasks
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/9824e517
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/9824e517
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/9824e517
Branch: refs/heads/S4-57
Commit: 9824e517729b026e0c60492cacbd05886476931b
Parents: b1c984f
Author: Daniel Gómez Ferro <dg...@yahoo.es>
Authored: Thu Jul 12 12:15:14 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Thu Jul 12 15:22:15 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/tools/Deploy.java | 2 ++
.../src/main/java/org/apache/s4/tools/Package.java | 3 +++
.../src/main/java/org/apache/s4/tools/Tools.java | 3 ---
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/9824e517/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
index d1d8857..8baa038 100644
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
@@ -102,6 +102,8 @@ public class Deploy extends S4ArgsBase {
"/s4/clusters/" + deployArgs.clusterName + "/app/" + deployArgs.appName,
s4rToDeploy.getAbsolutePath() });
+ // Explicitly shutdown the JVM since Gradle leaves non-daemon threads running that delay the termination
+ System.exit(0);
} catch (Exception e) {
LoggerFactory.getLogger(Deploy.class).error("Cannot deploy app", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/9824e517/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
index d737d40..5861031 100644
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
@@ -23,6 +23,9 @@ public class Package extends S4ArgsBase {
params.add("appClass=" + packageArgs.appClass);
params.add("appName=" + packageArgs.appName.get(0));
ExecGradle.exec(packageArgs.gradleBuildFile, "installS4R", params.toArray(new String[] {}));
+
+ // Explicitly shutdown the JVM since Gradle leaves non-daemon threads running that delay the termination
+ System.exit(0);
} catch (Exception e) {
LoggerFactory.getLogger(Package.class).error("Cannot deploy app", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/9824e517/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Tools.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Tools.java b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Tools.java
index 114a4e9..7ddf48a 100644
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Tools.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Tools.java
@@ -74,9 +74,6 @@ public class Tools {
taskArgs.addAll(Arrays.asList(Arrays.copyOfRange(args, 2, args.length)));
}
task.dispatch(taskArgs.toArray(new String[] {}));
-
- // Explicitly shutdown the JVM since Gradle leaves non-daemon threads running that delay the termination
- System.exit(0);
}
private static List<String> getTaskNames() {