summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2015-12-03 18:54:23 +0100
committerJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2015-12-03 18:54:23 +0100
commit7b28e920ff2c72feeb56e699dbdb45e54e758aa0 (patch)
tree5098ad0ddec9d44ac65374a802a5f43f09ef3270
parentd5f73f7eab6c44331d7922e9646bfcb0f01d99ed (diff)
parente56bec64777c277833552303caa2d0c09b702831 (diff)
downloadrabbitmq-server-git-7b28e920ff2c72feeb56e699dbdb45e54e758aa0.tar.gz
Merge pull request #468 from rabbitmq/rabbitmq-server-464
Make wait command wait for start_rabbitmq_server command
-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