summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2012-05-04 11:19:32 +0100
committerTim Watson <tim@rabbitmq.com>2012-05-04 11:19:32 +0100
commitae28e4e11c70481f97ceae65decd060084762c8a (patch)
tree62664d62fa4961fa3daf484baeee1475d3841581
parent0b615bd03f7ac72f98dec53535f9bc37c8325610 (diff)
downloadrabbitmq-server-ae28e4e11c70481f97ceae65decd060084762c8a.tar.gz
rabbitmq-server uses start_cold
-rwxr-xr-xscripts/rabbitmq-server14
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 3b31e83b..4dd81a84 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -77,14 +77,15 @@ if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
-hidden \
-s rabbit_prelaunch \
-sname rabbitmqprelaunch$$ \
- -extra "$RABBITMQ_ENABLED_PLUGINS_FILE" "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}"
+ -extra "${RABBITMQ_NODENAME}"
then
- RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit"
- RABBITMQ_EBIN_PATH=""
+ RABBITMQ_BOOT_FILE=start_sasl
+ RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}"
else
exit 1
fi
else
+ # TODO: does this branch actually make any sense now???
RABBITMQ_BOOT_FILE=start_sasl
RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}"
fi
@@ -104,6 +105,7 @@ exec erl \
${RABBITMQ_START_RABBIT} \
-sname ${RABBITMQ_NODENAME} \
-boot ${RABBITMQ_BOOT_FILE} \
+ -s rabbit start_cold \
${RABBITMQ_CONFIG_ARG} \
+W w \
${RABBITMQ_SERVER_ERL_ARGS} \
@@ -112,9 +114,9 @@ exec erl \
-sasl sasl_error_logger false \
-rabbit error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
-rabbit sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \
- -rabbit enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \
- -rabbit plugins_dir "$RABBITMQ_PLUGINS_DIR" \
- -rabbit plugins_expand_dir "$RABBITMQ_PLUGINS_EXPAND_DIR" \
+ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \
+ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
+ -rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \
-os_mon start_cpu_sup false \
-os_mon start_disksup false \
-os_mon start_memsup false \