Support extensions in config files

4 files changed, 91 insertions, 20 deletions

diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index fb290b6075..19b20a4680 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -81,7 +81,7 @@ if "!RABBITMQ_NODENAME!"=="" (
     if "!NODENAME!"=="" (

         REM We use Erlang to query the local hostname because

         REM !COMPUTERNAME! and Erlang may return different results.

-        REM Start erl with -sname to make sure epmd is started. 

+        REM Start erl with -sname to make sure epmd is started.

         call "%ERLANG_HOME%\bin\erl.exe" -A0 -noinput -boot start_clean -sname rabbit-prelaunch-epmd -eval "init:stop()." >nul 2>&1

         for /f "delims=" %%F in ('call "%ERLANG_HOME%\bin\erl.exe" -A0 -noinput -boot start_clean -eval "net_kernel:start([list_to_atom(""rabbit-gethostname-"" ++ os:getpid()), %NAMETYPE%]), [_, H] = string:tokens(atom_to_list(node()), ""@""), io:format(""~s~n"", [H]), init:stop()."') do @set HOSTNAME=%%F

         set RABBITMQ_NODENAME=rabbit@!HOSTNAME!

@@ -154,6 +154,8 @@ REM [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_
 REM No Windows equivalent

 

 REM [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}

+

+CALL :unquote RABBITMQ_CONFIG_FILE %RABBITMQ_CONFIG_FILE%

 if "!RABBITMQ_CONFIG_FILE!"=="" (

     if "!CONFIG_FILE!"=="" (

         set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

@@ -421,3 +423,7 @@ REM ##--- End of overridden <var_name> variables
 REM

 REM # Since we source this elsewhere, don't accidentally stop execution

 REM true

+

+:unquote

+set %1=%~2

+EXIT /B 0

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index d3ad47a912..61d0768f6c 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -95,10 +95,15 @@ fi
 
 set -e
 
-if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
-    RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
-elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
-    RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \
+RABBITMQ_CONFIG_FILE_NOEX="${RABBITMQ_CONFIG_FILE%.*}"
+echo "NOEX: ${RABBITMQ_CONFIG_FILE_NOEX}"
+
+if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" == "${RABBITMQ_CONFIG_FILE}" ]; then
+    if [ -f "${RABBITMQ_CONFIG_FILE}" ]; then
+        RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}"
+    fi
+elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" == "${RABBITMQ_CONFIG_FILE}" ]; then
+    RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \
                          -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
                          -conf_script_dir `dirname $0` \
                          -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}"
@@ -107,6 +112,21 @@ elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
                              -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \
                              -config ${RABBITMQ_ADVANCED_CONFIG_FILE}"
     fi
+elif [ "${RABBITMQ_CONFIG_FILE_NOEX}" == "${RABBITMQ_CONFIG_FILE}" ]; then
+    if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
+        RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}"
+    elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
+        echo "NOEX CONF"
+        RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \
+                             -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
+                             -conf_script_dir `dirname $0` \
+                             -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}"
+        if [ -f "${RABBITMQ_ADVANCED_CONFIG_FILE}.config" ]; then
+            RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \
+                                 -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \
+                                 -config ${RABBITMQ_ADVANCED_CONFIG_FILE}"
+        fi
+    fi
 fi
 
 RABBITMQ_LISTEN_ARG=
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 2a38e77a82..034abd4721 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -42,8 +42,6 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 

 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin

 

-set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"

-

 "!ERLANG_HOME!\bin\erl.exe" ^

         -pa "!RABBITMQ_EBIN_ROOT!" ^

         -noinput -hidden ^

@@ -68,10 +66,28 @@ if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
 

 set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"

 

-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!" ^

+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 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!

@@ -80,7 +96,7 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" (
                                 -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

                                 -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"

     )

-) 

+)

 

 set RABBITMQ_LISTEN_ARG=

 if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

@@ -114,7 +130,7 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (
 

 

 set ENV_OK=true

-CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE! 

+CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE!

 CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!

 CALL :check_not_empty "RABBITMQ_NODENAME" !RABBITMQ_NODENAME!

 

@@ -157,10 +173,14 @@ EXIT /B 0
 if "%~2"=="" (

     ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env and rabbitmq-defaults, and !RABBITMQ_CONF_ENV_FILE! script files. Check also your Environment Variables settings"

     set ENV_OK=false

-    EXIT /B 78 

+    EXIT /B 78

     )

 EXIT /B 0

 

+:get_noex

+set RABBITMQ_CONFIG_FILE_NOEX=%~dpn1

+EXIT /B 0

+

 endlocal

 endlocal

 

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