diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-04-24 14:46:49 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-04-24 14:46:49 +0100 |
| commit | 3e1deb156086fa71c246f160d79b055b99978921 (patch) | |
| tree | cd20974ac94506bbfc37a8c6c2e7724cb8e4a5e9 /scripts/rabbitmq-server | |
| parent | ffcbd1220b02de9c78aa4cef40e90b46b4100ec6 (diff) | |
| parent | d4d6e415612253469532409b5e74aa9f12657fce (diff) | |
| download | rabbitmq-server-git-3e1deb156086fa71c246f160d79b055b99978921.tar.gz | |
Merged stable into default
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 184ae9311a..161ec2e6df 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} \ |