diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-08-02 16:44:14 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-08-02 16:44:14 +0100 |
| commit | d2e2fa6099077c1f2cf6cb82fdddadca4858bc5a (patch) | |
| tree | e0cd536f7237cdea6e3e0dfffb47bd42e1ef0202 /scripts/rabbitmq-server | |
| parent | b28f428065dcc90a6937782cd69d353aedf0ebe1 (diff) | |
| parent | 2efd9f8a2a2b167b21fc22b427613564b0bf6807 (diff) | |
| download | rabbitmq-server-git-d2e2fa6099077c1f2cf6cb82fdddadca4858bc5a.tar.gz | |
Merging default into bug21875
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index aaa131eece..e202872818 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -30,7 +30,8 @@ ## Contributor(s): ______________________________________. ## -NODENAME=rabbit +[ "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}]" @@ -81,12 +82,6 @@ fi [ -f "${RABBITMQ_LOGS}" ] && cat "${RABBITMQ_LOGS}" >> "${RABBITMQ_LOGS}${RABBITMQ_BACKUP_EXTENSION}" [ -f "${RABBITMQ_SASL_LOGS}" ] && cat "${RABBITMQ_SASL_LOGS}" >> "${RABBITMQ_SASL_LOGS}${RABBITMQ_BACKUP_EXTENSION}" -if [ -f "$RABBITMQ_CLUSTER_CONFIG_FILE" ]; then - RABBITMQ_CLUSTER_CONFIG_OPTION="-rabbit cluster_config \"$RABBITMQ_CLUSTER_CONFIG_FILE\"" -else - RABBITMQ_CLUSTER_CONFIG_OPTION="" -fi - RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' @@ -138,6 +133,5 @@ exec erl \ -os_mon start_disksup false \ -os_mon start_memsup false \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ - ${RABBITMQ_CLUSTER_CONFIG_OPTION} \ ${RABBITMQ_SERVER_START_ARGS} \ "$@" |