diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-03-11 16:15:03 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-03-11 16:15:03 +0000 |
| commit | ecc5fae0ea796d8b51f4eee75c1045b09fc389d3 (patch) | |
| tree | b1f1b18f8367c2bde74ab04867b8369905a9c1db /scripts/rabbitmq-server | |
| parent | 42cff68581fe5772de741012b3d75f0c336a4fd6 (diff) | |
| parent | 6551ce1f20f5d6dfbac6e3c994f8cc2273fc1917 (diff) | |
| download | rabbitmq-server-ecc5fae0ea796d8b51f4eee75c1045b09fc389d3.tar.gz | |
Merge bug25271
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 184ae931..161ec2e6 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -82,7 +82,8 @@ case "$(uname -s)" in esac RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" -if ! erl -pa "$RABBITMQ_EBIN_ROOT" \ +if ! ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \ + -boot "${CLEAN_BOOT_FILE}" \ -noinput \ -hidden \ -s rabbit_prelaunch \ @@ -103,11 +104,11 @@ RABBITMQ_LISTEN_ARG= # there is no other way of preventing their expansion. set -f -exec erl \ +exec ${ERL_DIR}erl \ -pa ${RABBITMQ_EBIN_ROOT} \ ${RABBITMQ_START_RABBIT} \ -sname ${RABBITMQ_NODENAME} \ - -boot start_sasl \ + -boot "${SASL_BOOT_FILE}" \ ${RABBITMQ_CONFIG_ARG} \ +W w \ ${RABBITMQ_SERVER_ERL_ARGS} \ |