summaryrefslogtreecommitdiff
path: root/scripts/rabbitmqctl
diff options
context:
space:
mode:
authorTony Garnock-Jones <tonyg@lshift.net>2009-09-18 13:05:47 +0100
committerTony Garnock-Jones <tonyg@lshift.net>2009-09-18 13:05:47 +0100
commita95080fdfe8a7d2fdbf25fba6654abc77fd1d2ba (patch)
tree5e17e538b258024f055002cc0761056bdd16882b /scripts/rabbitmqctl
parent218f55288615945c9c3dcca7fb862b7b5e5ec2b2 (diff)
parent79b4481a858020c2486f5b561b63d427c61bcf35 (diff)
downloadrabbitmq-server-git-a95080fdfe8a7d2fdbf25fba6654abc77fd1d2ba.tar.gz
merge default into bug21346
Diffstat (limited to 'scripts/rabbitmqctl')
-rwxr-xr-xscripts/rabbitmqctl4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index c57978c050..9c45e73dd5 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -30,12 +30,12 @@
## Contributor(s): ______________________________________.
##
-[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
+. `dirname $0`/rabbitmq-env
[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
exec erl \
- -pa "`dirname $0`/../ebin" \
+ -pa "${RABBITMQ_HOME}/ebin" \
-noinput \
-hidden \
${RABBITMQ_CTL_ERL_ARGS} \