diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-06-10 13:24:31 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-06-10 13:24:31 +0100 |
| commit | cb09a100711be74fa6d7dc9cee275147289ec1eb (patch) | |
| tree | e409216d2387bd2b866594f1032d4a41551b9201 /scripts/rabbitmq-server | |
| parent | f634ec37692ba97eb445b944bc08927d9071beaa (diff) | |
| download | rabbitmq-server-git-cb09a100711be74fa6d7dc9cee275147289ec1eb.tar.gz | |
Make nodename available to rabbitmq-env in startup scripts
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 0ee43649b7..2261b56ef5 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}]" @@ -56,8 +57,7 @@ else then RABBITMQ_NODE_PORT=${DEFAULT_NODE_PORT} fi fi -[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}@${HOSTNAME%%.*} +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE} [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} |