diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-09-18 13:05:47 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-09-18 13:05:47 +0100 |
| commit | a95080fdfe8a7d2fdbf25fba6654abc77fd1d2ba (patch) | |
| tree | 5e17e538b258024f055002cc0761056bdd16882b /scripts/rabbitmq-multi | |
| parent | 218f55288615945c9c3dcca7fb862b7b5e5ec2b2 (diff) | |
| parent | 79b4481a858020c2486f5b561b63d427c61bcf35 (diff) | |
| download | rabbitmq-server-git-a95080fdfe8a7d2fdbf25fba6654abc77fd1d2ba.tar.gz | |
merge default into bug21346
Diffstat (limited to 'scripts/rabbitmq-multi')
| -rwxr-xr-x | scripts/rabbitmq-multi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 1d0c785f6b..7db4cb70b2 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -37,7 +37,7 @@ PIDS_FILE=/var/lib/rabbitmq/pids MULTI_ERL_ARGS= MULTI_START_ARGS= -[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf +. `dirname $0`/rabbitmq-env [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} @@ -60,7 +60,7 @@ export \ set -f exec erl \ - -pa "`dirname $0`/../ebin" \ + -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ ${RABBITMQ_MULTI_ERL_ARGS} \ |