diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-08-10 17:41:29 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-08-10 17:41:29 +0100 |
| commit | 9c358627c4529a60c2c48b9af8b6443cc5948527 (patch) | |
| tree | e4de9baf8bd63a15549972d894215a988356cbb2 /scripts/rabbitmq-server | |
| parent | 792d203882a9911a83c1baa396fec71d8f730670 (diff) | |
| parent | 4d019b5fc64e7643b76d691fdc084633a5bd4b58 (diff) | |
| download | rabbitmq-server-git-9c358627c4529a60c2c48b9af8b6443cc5948527.tar.gz | |
merge in from default. All tests seem to pass.
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 70e0c66bcd..2883df9da3 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -75,16 +75,25 @@ fi RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit' +RABBITMQ_EBIN_ROOT="`dirname $0`/../ebin" +if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ]; then + RABBITMQ_BOOT_FILE="${RABBITMQ_EBIN_ROOT}/rabbit" + RABBITMQ_EBIN_PATH="" +else + RABBITMQ_BOOT_FILE=start_sasl + RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}" +fi + # we need to turn off path expansion because some of the vars, notably # RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and # there is no other way of preventing their expansion. set -f exec erl \ - -pa "`dirname $0`/../ebin" \ + ${RABBITMQ_EBIN_PATH} \ ${RABBITMQ_START_RABBIT} \ -sname ${RABBITMQ_NODENAME} \ - -boot start_sasl \ + -boot ${RABBITMQ_BOOT_FILE} \ +W w \ ${RABBITMQ_SERVER_ERL_ARGS} \ -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \ |