Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Svetoslav Neykov 2017-07-20 10:14:50 +03:00
parent 3b5fe0b02f
commit 5b57b73cf7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compute/src/test/java/org/jclouds/compute/JettyStatements.java
View File

@ -57,7 +57,7 @@ public class JettyStatements {
public static Statement start() { public static Statement start() {
return new StatementList( 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 literal("test $? && sleep 1")); // in case it is slow starting the proc
} }

2
compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
View File

@ -303,7 +303,7 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes
clientNew.disconnect(); clientNew.disconnect();
String startJetty = new StringBuilder() 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(); .append("test $? && sleep 1").append('\n').toString();
clientNew.connect(); clientNew.connect();