summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-03-13 15:07:48 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-03-13 15:07:48 +0000
commit186e383526497689925cbf58e0e436c03afc5db7 (patch)
tree7ad07ea71f8b0b6eff7a5b7a485bed01d8b33f40
parenta384b76234a95da979ed407d3a8d4c4c9598c651 (diff)
downloadrabbitmq-server-186e383526497689925cbf58e0e436c03afc5db7.tar.gz
Move dist arg to the end so that if the user has set it in RABBITMQ_SERVER_START_ARGS then we take their version not ours.
-rwxr-xr-xscripts/rabbitmq-server2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 2f89abdb..6c8e72eb 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -124,7 +124,6 @@ exec ${ERL_DIR}erl \
+W w \
${RABBITMQ_SERVER_ERL_ARGS} \
${RABBITMQ_LISTEN_ARG} \
- ${RABBITMQ_DIST_ARG} \
-sasl errlog_type error \
-sasl sasl_error_logger false \
-rabbit error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
@@ -137,4 +136,5 @@ exec ${ERL_DIR}erl \
-os_mon start_memsup false \
-mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
${RABBITMQ_SERVER_START_ARGS} \
+ ${RABBITMQ_DIST_ARG} \
"$@"