You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by sv...@apache.org on 2017/07/20 13:49:49 UTC
jclouds git commit: Makes sure Jetty doesn't terminate on ssh
disconnect
Repository: jclouds
Updated Branches:
refs/heads/master aa11765be -> 0c054c183
Makes sure Jetty doesn't terminate on ssh disconnect
Fixes BaseComputeServiceAdapterLiveTest.testCreateAndRunAService for CentOS 7. disown in jetty.sh is not enough to detach the process from the current session so it's terminated when jclouds closes the connection.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0c054c18
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0c054c18
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0c054c18
Branch: refs/heads/master
Commit: 0c054c18359fc2bd0f1de2344b6e021a38aed695
Parents: aa11765
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Jul 20 10:14:50 2017 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Jul 20 16:49:03 2017 +0300
----------------------------------------------------------------------
compute/src/test/java/org/jclouds/compute/JettyStatements.java | 2 +-
.../org/jclouds/compute/StubComputeServiceIntegrationTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c054c18/compute/src/test/java/org/jclouds/compute/JettyStatements.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/JettyStatements.java b/compute/src/test/java/org/jclouds/compute/JettyStatements.java
index 63adf97..9f4aeb6 100644
--- a/compute/src/test/java/org/jclouds/compute/JettyStatements.java
+++ b/compute/src/test/java/org/jclouds/compute/JettyStatements.java
@@ -57,7 +57,7 @@ public class JettyStatements {
public static Statement start() {
return new StatementList(
- literal(String.format("JETTY_PORT=%d %s/bin/jetty.sh start", port, JETTY_HOME)),
+ literal(String.format("JETTY_PORT=%d nohup %s/bin/jetty.sh start > start.log 2>&1 < /dev/null &", port, JETTY_HOME)),
literal("test $? && sleep 1")); // in case it is slow starting the proc
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c054c18/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
index 9f20d65..392989c 100644
--- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
+++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
@@ -303,7 +303,7 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes
clientNew.disconnect();
String startJetty = new StringBuilder()
- .append("JETTY_PORT=8080 /usr/local/jetty/bin/jetty.sh start").append('\n')
+ .append("JETTY_PORT=8080 nohup /usr/local/jetty/bin/jetty.sh start > start.log 2>&1 < /dev/null &").append('\n')
.append("test $? && sleep 1").append('\n').toString();
clientNew.connect();