summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-03-25 15:51:12 +0000
committerEmile Joubert <emile@rabbitmq.com>2013-03-25 15:51:12 +0000
commite98b3e1249dbf2247e8ddb7e7948d978a31e7855 (patch)
tree301dcb0c8c52a7ec3c0317ba2b4accb017a16978 /scripts/rabbitmq-server
parentb45d38eb5638ece380b0ae864a85e9a45fa9db34 (diff)
parentbb754c38ec9b0fb562036b39a9762a905158227c (diff)
downloadrabbitmq-server-bug24114.tar.gz
Merged default into bug24114bug24114
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server7
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} \