summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2015-12-04 07:28:02 +0300
committerMichael Klishin <michael@clojurewerkz.org>2015-12-04 07:28:02 +0300
commitb191f452afaf832d5093077f463df82c9f522f20 (patch)
tree087f53fe362f65817c36f9c44b7e255a05aaa5cf /scripts
parent3c6425ff65229c4c0241358cde5629b4a5de364b (diff)
parent6b61f74ea78a0dcd99bda2fa6846d3d19824baad (diff)
downloadrabbitmq-server-git-b191f452afaf832d5093077f463df82c9f522f20.tar.gz
Merge branch 'stable'
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 71a6530321..69c2b7ff6c 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -161,7 +161,8 @@ if [ 'x' = "x$RABBITMQ_ALLOW_INPUT" -a -z "$detached" ]; then
start_rabbitmq_server "$@" &
# Block until RabbitMQ exits or a signal is caught.
- wait
+ # Waits for last command (which is start_rabbitmq_server)
+ wait $!
else
start_rabbitmq_server "$@"
fi