diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-05-15 16:20:30 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-05-15 16:20:30 +0100 |
| commit | 841d204c29986228b3af7382a0e2b5e8922a2ea3 (patch) | |
| tree | 60b84f0de412c2436f922644c581932bd1556aff /scripts/rabbitmq-server | |
| parent | 9194ab8cba39c7aec312ec7e9ff0eea3a6744af6 (diff) | |
| download | rabbitmq-server-git-841d204c29986228b3af7382a0e2b5e8922a2ea3.tar.gz | |
rabbit_control waits as long as process is alive
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 57f37ff9be..ba18766c95 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -70,18 +70,15 @@ case "$(uname -s)" in esac RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" -if erl \ - -pa "$RABBITMQ_EBIN_ROOT" \ - -noinput \ - -hidden \ - -s rabbit_prelaunch \ - -sname rabbitmqprelaunch$$ \ - -extra "${RABBITMQ_NODENAME}" -then - RABBITMQ_BOOT_FILE=start_sasl - RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}" -else - exit 1 +if ! `erl \ + -pa "$RABBITMQ_EBIN_ROOT" \ + -noinput \ + -hidden \ + -s rabbit_prelaunch \ + -sname rabbitmqprelaunch$$ \ + -extra "${RABBITMQ_NODENAME}"`; + then + exit 1; fi RABBITMQ_CONFIG_ARG= @@ -96,10 +93,10 @@ RABBITMQ_LISTEN_ARG= set -f exec erl \ - ${RABBITMQ_EBIN_PATH} \ + -pa ${RABBITMQ_EBIN_ROOT} \ ${RABBITMQ_START_RABBIT} \ -sname ${RABBITMQ_NODENAME} \ - -boot ${RABBITMQ_BOOT_FILE} \ + -boot start_sasl \ -s rabbit boot \ ${RABBITMQ_CONFIG_ARG} \ +W w \ |