diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-09 14:35:47 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-09 14:35:47 +0000 |
| commit | fbb49b43fd6a3472fffb6ad7f0ecea94a4727926 (patch) | |
| tree | f638ac304e5f0006311ebe17c9a7648baad771e7 /scripts/rabbitmq-service.bat | |
| parent | bbaf22bd1fe2397dd0f97cf2fcde84db42e62837 (diff) | |
| download | rabbitmq-server-git-fbb49b43fd6a3472fffb6ad7f0ecea94a4727926.tar.gz | |
Additional config gile
Diffstat (limited to 'scripts/rabbitmq-service.bat')
| -rw-r--r-- | scripts/rabbitmq-service.bat | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 144091feec..494716d121 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -22,7 +22,6 @@ rem enabling delayed expansion set TN0=%~n0
set TDP0=%~dp0
set P1=%1
-set CUTTLEFISH=%~dp0\cuttlefish
setlocal enabledelayedexpansion
REM Get default settings with user overrides for (RABBITMQ_)<var_name>
@@ -122,7 +121,8 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!" -noinput -hidden ^
-s rabbit_prelaunch ^
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
- -conf_gen_script "!CUTTLEFISH!" ^
+ -conf_script_dir "!TDP0!" ^
+ -conf_additional "!RABBITMQ_CONFIG_ADDITIONAL!" ^
!RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!
if ERRORLEVEL 3 (
@@ -140,10 +140,10 @@ if ERRORLEVEL 3 ( if exist "!RABBITMQ_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
) else if exist "!RABBITMQ_CONFIG_FILE!.conf" (
- set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_gen_script "!CUTTLEFISH!"
+ set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_script_dir "!TDP0!" -conf_additional "!RABBITMQ_CONFIG_ADDITIONAL!"
) else (
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 "!CUTTLEFISH!"
+ set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_script_dir "!TDP0!" -conf_additional "!RABBITMQ_CONFIG_ADDITIONAL!"
)
set RABBITMQ_LISTEN_ARG=
|