summaryrefslogtreecommitdiff
path: root/scripts/rabbitmqctl
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2010-06-10 13:24:31 +0100
committerEmile Joubert <emile@rabbitmq.com>2010-06-10 13:24:31 +0100
commitcb09a100711be74fa6d7dc9cee275147289ec1eb (patch)
treee409216d2387bd2b866594f1032d4a41551b9201 /scripts/rabbitmqctl
parentf634ec37692ba97eb445b944bc08927d9071beaa (diff)
downloadrabbitmq-server-git-cb09a100711be74fa6d7dc9cee275147289ec1eb.tar.gz
Make nodename available to rabbitmq-env in startup scripts
Diffstat (limited to 'scripts/rabbitmqctl')
-rwxr-xr-xscripts/rabbitmqctl6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index c204fc5af2..92e5312bb2 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -30,12 +30,12 @@
## Contributor(s): ______________________________________.
##
-NODENAME=rabbit
+[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s`
+NODENAME=rabbit@${HOSTNAME%%.*}
. `dirname $0`/rabbitmq-env
-[ "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_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
exec erl \