summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2010-12-23 16:21:13 +0000
committerEmile Joubert <emile@rabbitmq.com>2010-12-23 16:21:13 +0000
commitfc11634c5c1cb7701563b2d66fe3fafd8a3f9505 (patch)
tree88a0a339e607bee99841d5599dbd8ba2808d26e6 /scripts/rabbitmq-server
parent831891ea9e3a4d7b13986cbb60f8f49dde909b52 (diff)
parent7842327c5653565ac13ea4406b41490a4f757881 (diff)
downloadrabbitmq-server-git-fc11634c5c1cb7701563b2d66fe3fafd8a3f9505.tar.gz
Merged default into bug23445
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index c5d883c365..4155b31d99 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -30,8 +30,6 @@
## Contributor(s): ______________________________________.
##
-[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s`
-NODENAME=rabbit@${HOSTNAME%%.*}
SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
-kernel inet_default_listen_options [{nodelay,true}] \
-kernel inet_default_connect_options [{nodelay,true}]"
@@ -91,8 +89,9 @@ if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
-pa "$RABBITMQ_EBIN_ROOT" \
-noinput \
-hidden \
- -s rabbit_plugin_activator \
- -extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}"
+ -s rabbit_prelaunch \
+ -sname rabbitmqprelaunch$$ \
+ -extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}"
then
RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit"
RABBITMQ_EBIN_PATH=""