diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2009-10-05 15:31:53 +0100 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2009-10-05 15:31:53 +0100 |
| commit | e205a1f1873b19f9dfb4ec934da1b4ee91e461a2 (patch) | |
| tree | 25f878eaf5a22fd1983a48cb09002a70ea631ab5 /scripts/rabbitmq-multi | |
| parent | 88d5f01b0241679fed1b1032dfde1d4760eaeb9d (diff) | |
| parent | 1ff98eb5204ee7edda8b85d74667e3d31e4bc5ac (diff) | |
| download | rabbitmq-server-git-e205a1f1873b19f9dfb4ec934da1b4ee91e461a2.tar.gz | |
Merge from default. Resolved some conflicts due to bool->boolean in
type specs, and a bad automerge in rabbit_reader.erl.
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} \ |