diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-31 10:13:26 +0100 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-04-05 21:32:12 +0300 |
| commit | 06fa298aacb9826a68224c123abb24c2cdabad22 (patch) | |
| tree | 2859c0ff0cbc69303fea79081112873d320f0abe | |
| parent | e3b856330562951fff07767ba82ccd03b13a19a4 (diff) | |
| download | rabbitmq-server-git-06fa298aacb9826a68224c123abb24c2cdabad22.tar.gz | |
Condition ordering to set RABBITMQ_CONFIG_ARG
| -rwxr-xr-x | scripts/rabbitmq-server | 8 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 32 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 33 |
3 files changed, 37 insertions, 36 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 65bca88844..62fb7b05fd 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -77,7 +77,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \ -extra "${RABBITMQ_NODENAME}" - + PRELAUNCH_RESULT=$? if [ ${PRELAUNCH_RESULT} = 2 ] ; then # dist port is mentioned in config, so do not set it @@ -119,11 +119,11 @@ elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" == "${RABBITMQ_CONFIG_FILE}" ]; then -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \ -config ${RABBITMQ_ADVANCED_CONFIG_FILE}" fi -elif [ "${RABBITMQ_CONFIG_FILE_NOEX}" == "${RABBITMQ_CONFIG_FILE}" ]; then +else if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then - RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}" + RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}" elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then - RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \ + RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \ -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \ -conf_script_dir `dirname $0` \ -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}" diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 034abd4721..cae876f1d2 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -68,21 +68,7 @@ set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!" 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!.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!
- 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 "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" (
if exist "!RABBITMQ_CONFIG_FILE!" (
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_NOEX!"
)
@@ -96,6 +82,20 @@ if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" ( -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
-config "!RABBITMQ_ADVANCED_CONFIG_FILE!"
)
+) else (
+ 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_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!"
+ )
+ )
)
set RABBITMQ_LISTEN_ARG=
@@ -126,7 +126,7 @@ if "!RABBITMQ_NODE_ONLY!"=="" ( if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (
set RABBITMQ_IO_THREAD_POOL_SIZE=64
-)
+)
set ENV_OK=true
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 58e92eb36d..e635cb6896 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -159,9 +159,24 @@ if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" ( CALL :get_noex !RABBITMQ_CONFIG_FILE!
-if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" (
- if exist "!RABBITMQ_CONFIG_FILE!.config" (
+
+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!
+ 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 exist "!RABBITMQ_CONFIG_FILE!.config" (
+ set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
) else if exist "!RABBITMQ_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
) else (
@@ -177,20 +192,6 @@ if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" ( -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!
- 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!"
- )
)
|