diff options
| author | Paul Jones <paulj@lshift.net> | 2009-09-21 09:18:03 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-09-21 09:18:03 +0100 |
| commit | 3c047addbb00dd8f3d441a9289f4855d553e7344 (patch) | |
| tree | e5ba01d7b6a62bc063673f56ad138599e6083a0f | |
| parent | fb9cb12ac7cde685389aee9488131446a44b40dc (diff) | |
| download | rabbitmq-server-bug21560.tar.gz | |
Corrected behaviour of run-node so the boot file is not usedbug21560
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 5 |
2 files changed, 5 insertions, 3 deletions
@@ -79,13 +79,14 @@ BASIC_SCRIPT_ENVIRONMENT_SETTINGS=\ run: all $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ - RABBITMQ_NODE_ONLY=true \ + RABBITMQ_ALLOW_INPUT=true \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -s rabbit" \ ./scripts/rabbitmq-server run-node: all $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ + RABBITMQ_ALLOW_INPUT=true \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ ./scripts/rabbitmq-server diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 547220b4..e5317bb1 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -73,10 +73,11 @@ else fi RABBITMQ_START_RABBIT= -[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit' +[ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' +[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="${RABBITMQ_START_RABBIT} -s rabbit" RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" -if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ]; then +if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ] && [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then RABBITMQ_BOOT_FILE="${RABBITMQ_EBIN_ROOT}/rabbit" RABBITMQ_EBIN_PATH="" else |