summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-service.bat
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2016-02-08 16:25:36 +0000
committerDaniil Fedotov <dfedotov@pivotal.io>2016-02-08 16:25:36 +0000
commit85b811e30b792c42d1c1f087eaec41725f64d06f (patch)
tree53c884026594befc2a99d90caecf5f61b649fe54 /scripts/rabbitmq-service.bat
parentb27e7d1dfb889df1b2c98c6101bf8cb3cf281e15 (diff)
downloadrabbitmq-server-git-85b811e30b792c42d1c1f087eaec41725f64d06f.tar.gz
Config detection in rabbit_config. Always pass generate args to windows script
Diffstat (limited to 'scripts/rabbitmq-service.bat')
-rw-r--r--scripts/rabbitmq-service.bat3
1 files changed, 2 insertions, 1 deletions
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=