diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 8eca8b6967..d5a5948f48 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -72,7 +72,6 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -conf_gen_script "`dirname $0`/cuttlefish" \ -extra "${RABBITMQ_NODENAME}" -exit 89 PRELAUNCH_RESULT=$? if [ ${PRELAUNCH_RESULT} = 2 ] ; then # dist port is mentioned in config, so do not set it diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index a80cb3aa6d..600b175df3 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -140,7 +140,8 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" ( ) else if exist "!RABBITMQ_CONFIG_FILE!.conf" (
set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_gen_script "%~dp0/cuttlefish"
) else (
- set RABBITMQ_CONFIG_ARG=
+ rem Always use generated config arguments, because file existance can change beetween restarts
+ set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_gen_script "%~dp0/cuttlefish"
)
set RABBITMQ_LISTEN_ARG=
|