summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-03-08 15:30:39 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-03-08 15:30:45 +0100
commitb4d1a07d51523c097ab951ddd25c35bd534c4f99 (patch)
treeeeceb088a1efe569c9bb3b5aca6a16f212c79afc
parentf1e2cc161e5ece5c1a76e8fdb727de68b04ca93a (diff)
downloaddeployment-b4d1a07d51523c097ab951ddd25c35bd534c4f99.tar.gz
deployment-b4d1a07d51523c097ab951ddd25c35bd534c4f99.tar.bz2
deployment-b4d1a07d51523c097ab951ddd25c35bd534c4f99.zip
fix arm restart
-rwxr-xr-xbin/taler-deployment-restart14
-rwxr-xr-xbin/taler-deployment-stop2
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/taler-deployment-restart b/bin/taler-deployment-restart
index 6a63fbe..2cb0188 100755
--- a/bin/taler-deployment-restart
+++ b/bin/taler-deployment-restart
@@ -2,15 +2,15 @@
base=$HOME
-export PATH="$base/deployment":$PATH
+export PATH="$base/deployment/bin":$PATH
ulimit -c $((100 * 1024))
cd $HOME
-# the following commands must (?) be called by absolute
-# path because buildbot ignores PATH set above. That
-# of course works just on systems having everything in the
-# 'right' place.
-$HOME/deployment/bin/taler-deployment-arm -e -T 1s &>/dev/null
-$HOME/deployment/bin/taler-deployment-start
+if taler-deployment-arm -T 300ms -I; then
+ # looks like deployment is running, stop it
+ taler-deployment-arm -e -T 10s &>/dev/null
+fi
+
+taler-deployment-start
diff --git a/bin/taler-deployment-stop b/bin/taler-deployment-stop
index cfaa3b3..223bcaa 100755
--- a/bin/taler-deployment-stop
+++ b/bin/taler-deployment-stop
@@ -8,4 +8,4 @@ ulimit -c $((100 * 1024))
cd $HOME
-taler-deployment-arm -e -T 1s &>/dev/null
+taler-deployment-arm -e -T 5s &>/dev/null