summaryrefslogtreecommitdiff
path: root/scripts/rabbitmqctl
diff options
context:
space:
mode:
authorSteve Powell <steve@rabbitmq.com>2012-02-03 15:34:38 +0000
committerSteve Powell <steve@rabbitmq.com>2012-02-03 15:34:38 +0000
commitbde5f08b59a14856227d9a2bffb6dbf01ca6249d (patch)
tree35c47511cf0fbd653e983bd79f1e8651201b9f3d /scripts/rabbitmqctl
parente63f34ead24e91834542f12114473d0a00d60f5d (diff)
downloadrabbitmq-server-bug24721.tar.gz
Defaults all centralised and isolated.bug24721
Diffstat (limited to 'scripts/rabbitmqctl')
-rwxr-xr-xscripts/rabbitmqctl9
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index 887eeac6..78926322 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -16,16 +16,9 @@
##
# Get default settings with user overrides for (RABBITMQ_)<var_name>
-# Non-empty defaults should be set in rabbitmq-env
+# All settings are obtained in rabbitmq-env
. `dirname $0`/rabbitmq-env
-##--- Set environment vars RABBITMQ_<var_name> to defaults if not set
-
-[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
-[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-
-##--- End of overridden <var_name> variables
-
exec erl \
-pa "${RABBITMQ_HOME}/ebin" \
-noinput \