diff options
| author | David Wragg <david@rabbitmq.com> | 2011-01-07 15:01:38 +0000 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2011-01-07 15:01:38 +0000 |
| commit | a5e8b83b35302334013cdd0bd630acc188b550ed (patch) | |
| tree | 72d5db974ad4b034643132c6568b045eaa82baab /scripts/rabbitmq-server | |
| parent | 49ce527be88c18a549d9c8a5be0aca6befc3ca30 (diff) | |
| parent | 4de1294c7c8172943de213d106db8ad96a0971df (diff) | |
| download | rabbitmq-server-git-a5e8b83b35302334013cdd0bd630acc188b550ed.tar.gz | |
Merge default into bug23568
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 7 |
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="" |