summaryrefslogtreecommitdiff
path: root/scripts/rabbitmqctl
diff options
context:
space:
mode:
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 \