diff options
| author | David Wragg <dpw@lshift.net> | 2009-08-20 13:58:22 +0100 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-08-20 13:58:22 +0100 |
| commit | dd56a8132e6076e8690e5cb1fba2da567fbb2997 (patch) | |
| tree | 27440ae83e18a3f9e126349f1e9a35d833a43e7a /scripts/rabbitmq-multi | |
| parent | 5f3ee0a97a30a9dcd06d16efcab53716b52949c8 (diff) | |
| parent | 49157676d8179402e9474e80ed25e8aa6f95087c (diff) | |
| download | rabbitmq-server-git-dd56a8132e6076e8690e5cb1fba2da567fbb2997.tar.gz | |
Merge default into bug19973, resolving conflict
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} \ |