diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-18 16:26:04 +0000 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-04-05 21:32:12 +0300 |
| commit | b3eb6fd3809a8fc74601d44997eac2bc007194b1 (patch) | |
| tree | 507ba6fb1668ca664821a4a7dba14e7b167f5d03 /scripts/rabbitmq-service.bat | |
| parent | 277c477091c3ebbd3f23b56ea6f2abaf0c883a91 (diff) | |
| download | rabbitmq-server-git-b3eb6fd3809a8fc74601d44997eac2bc007194b1.tar.gz | |
Support extensions in config files
Diffstat (limited to 'scripts/rabbitmq-service.bat')
| -rw-r--r-- | scripts/rabbitmq-service.bat | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 7e80e78398..58e92eb36d 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -157,12 +157,32 @@ if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" ( echo []. > !RABBITMQ_ADVANCED_CONFIG_FILE!.config
)
-if exist "!RABBITMQ_CONFIG_FILE!.config" (
- set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
-) else (
- rem Always specify generated config arguments, we cannot
- rem assume .conf file is available
- set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
+CALL :get_noex !RABBITMQ_CONFIG_FILE!
+
+if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" (
+ if exist "!RABBITMQ_CONFIG_FILE!.config" (
+ set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_NOEX!"
+ ) else if exist "!RABBITMQ_CONFIG_FILE!.config" (
+ set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
+ ) else (
+ rem Always specify generated config arguments, we cannot
+ rem assume .conf file is available
+ set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
+ -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
+ -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
+ -conf_schema_dir !RABBITMQ_SCHEMA_DIR!
+ if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
+ set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
+ -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
+ -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"
+ )
+ )
+) else if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" (
+ if exist "!RABBITMQ_CONFIG_FILE!" (
+ set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_NOEX!"
+ )
+) else if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (
+ set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE_NOEX!" ^
-conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
-conf_schema_dir !RABBITMQ_SCHEMA_DIR!
@@ -173,6 +193,7 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" ( )
)
+
set RABBITMQ_LISTEN_ARG=
if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
if not "!RABBITMQ_NODE_PORT!"=="" (
@@ -267,5 +288,9 @@ if "%~2"=="" ( )
EXIT /B 0
+:get_noex
+set RABBITMQ_CONFIG_FILE_NOEX=%~dpn1
+EXIT /B 0
+
endlocal
endlocal
|