diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-07-27 10:39:13 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-07-27 10:39:13 +0100 |
| commit | 39d8c604b32471fbf0afac857f02f0793c7d44e6 (patch) | |
| tree | 8969787360372be1e2e080de6baa8b13bdb3858b /scripts/rabbitmq-server | |
| parent | a081ca5b67d101f92657422f3742fab6c798c14b (diff) | |
| parent | f94bf63bf7a96b18a493aae4a54dfec85e6adb80 (diff) | |
| download | rabbitmq-server-git-39d8c604b32471fbf0afac857f02f0793c7d44e6.tar.gz | |
merge bug21243 into default
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 8502d60abc..40e32d3da9 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}'}]' \ |