diff options
| author | Tim Watson <tim.watson@gmail.com> | 2012-05-10 14:43:00 +0100 |
|---|---|---|
| committer | Tim Watson <tim.watson@gmail.com> | 2012-05-10 14:43:00 +0100 |
| commit | 0e1ed210dbd8f3e942e6d457ca36369278cfa2da (patch) | |
| tree | e7a23b14d30ede1394f8788eef90c65ac6c155b0 /scripts | |
| parent | 9a1a020fc5667f2527fe6c898a115cb858e737df (diff) | |
| download | rabbitmq-server-git-0e1ed210dbd8f3e942e6d457ca36369278cfa2da.tar.gz | |
remote TODO and extraneous branches from rabbit-server
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index e041d42502..57f37ff9be 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -70,25 +70,20 @@ case "$(uname -s)" in esac RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" -if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then - if erl \ +if erl \ -pa "$RABBITMQ_EBIN_ROOT" \ -noinput \ -hidden \ -s rabbit_prelaunch \ -sname rabbitmqprelaunch$$ \ -extra "${RABBITMQ_NODENAME}" - then +then RABBITMQ_BOOT_FILE=start_sasl RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}" - else - exit 1 - fi else - # TODO: does this branch actually make any sense now??? - RABBITMQ_BOOT_FILE=start_sasl - RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}" + exit 1 fi + RABBITMQ_CONFIG_ARG= [ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}" |