Merge pull request #1671 from rabbitmq/config_files_check

Config files check

6 files changed, 294 insertions, 151 deletions

diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index a4d78e6986..37a8985892 100755
--- a/scripts/rabbitmq-defaults
+++ b/scripts/rabbitmq-defaults
@@ -39,7 +39,7 @@ LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
 MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
 ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
 GENERATED_CONFIG_DIR=${SYS_PREFIX}/var/lib/rabbitmq/config
-ADVANCED_CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/advanced
+ADVANCED_CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/advanced.config
 SCHEMA_DIR=${SYS_PREFIX}/var/lib/rabbitmq/schema
 
 PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat
index 4fb09d0499..1cb605b80f 100644
--- a/scripts/rabbitmq-defaults.bat
+++ b/scripts/rabbitmq-defaults.bat
@@ -42,7 +42,7 @@ set LOG_BASE=!RABBITMQ_BASE!\log
 set MNESIA_BASE=!RABBITMQ_BASE!\db

 set ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins

 set GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config

-set ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced

+set ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced.config

 set SCHEMA_DIR=!RABBITMQ_BASE!\schema

 

 REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"

diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 02e0d0af99..a80edc69b4 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -194,7 +194,7 @@ if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
 CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%

 if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (

     if "!ADVANCED_CONFIG_FILE!"=="" (

-        set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced

+        set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced.config

     ) else (

         set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!

     )

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index f8b868c039..08cfb28cf7 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -62,13 +62,117 @@ RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 
 [ "$NOTIFY_SOCKET" ] && RUNNING_UNDER_SYSTEMD=true
 
-set +e
+if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then
+    mkdir -p "${RABBITMQ_SCHEMA_DIR}"
+fi
+
+if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then
+    mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}"
+fi
+
+if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then
+    cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}"
+fi
+
+get_noex() {
+    if [ "x" = "x${1}" ]; then
+        echo ""
+    else
+        local BASENAME=$(basename $1)
+        local DIRNAME=$(dirname $1)
+        if [ "x." = "x${DIRNAME}" ]; then
+            echo "${BASENAME%.*}"
+        else
+            echo "${DIRNAME}/${BASENAME%.*}"
+        fi
+    fi
+}
+
+# Check that advanced config file has the .config extension
+# Add .config extension if it's empty
+
+RABBITMQ_ADVANCED_CONFIG_FILE_NOEX=$(get_noex ${RABBITMQ_ADVANCED_CONFIG_FILE})
+if [ "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" \
+     -o "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
+    RABBITMQ_ADVANCED_CONFIG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config"
+fi
+
+
+RABBITMQ_CONFIG_FILE_NOEX=$(get_noex ${RABBITMQ_CONFIG_FILE})
+# Extension is not specified.
+# Determine config type from file
+
+if [ "${RABBITMQ_CONFIG_FILE_NOEX}" = "${RABBITMQ_CONFIG_FILE}" ]; then
+    if [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.config" ]; then
+        if [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.conf" ]; then
+            # Both files exist. Print a warning
+            echo "WARNING: Both old (.config) and new (.conf) format config files exist."
+            echo "WARNING: Using the old format config file: ${RABBITMQ_CONFIG_FILE_NOEX}.config"
+            echo "WARNING: Please update your config files to the new format and remove the old file"
+        fi
+        RABBITMQ_CONFIG_FILE="${RABBITMQ_CONFIG_FILE_NOEX}.config"
+    elif [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.conf" ]; then
+        RABBITMQ_CONFIG_FILE="${RABBITMQ_CONFIG_FILE_NOEX}.conf"
+    else
+        if [ -f ${RABBITMQ_ADVANCED_CONFIG_FILE} ]; then
+            echo "WARNING: Using RABBITMQ_ADVANCED_CONFIG_FILE: ${RABBITMQ_ADVANCED_CONFIG_FILE}"
+        fi
+        # No config file exist. Use advanced config for -config arg.
+        RABBITMQ_CONFIG_ARG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE}"
+        RABBITMQ_CONFIG_FILE=""
+    fi
+fi
+
+# Set the -config argument.
+# The -config argument should not have extension.
+# the file should exist
+# the file should be a valid erlang term file
+
+# Config file extension is .config
+if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_CONFIG_FILE}" ]; then
+    RABBITMQ_CONFIG_ARG_FILE="${RABBITMQ_CONFIG_FILE}"
+# Config file extension is .conf
+elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
+    RABBITMQ_CONFIG_ARG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE}"
+elif [ "x" != "x${RABBITMQ_CONFIG_FILE}" \
+       -a  "${RABBITMQ_CONFIG_FILE_NOEX}" != "${RABBITMQ_CONFIG_FILE}" ]; then
+    # Config file has an extension, but it's neither .conf or .config
+    echo "ERROR: Wrong extension for RABBITMQ_CONFIG_FILE: ${RABBITMQ_CONFIG_FILE}"
+    echo "ERROR: extension should be either .conf or .config"
+    exit 1
+fi
+
+RABBITMQ_CONFIG_ARG_FILE_NOEX=$(get_noex ${RABBITMQ_CONFIG_ARG_FILE})
+
+if [ "${RABBITMQ_CONFIG_ARG_FILE_NOEX}.config" != "${RABBITMQ_CONFIG_ARG_FILE}" ]; then
+    if [ "${RABBITMQ_CONFIG_ARG_FILE}" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
+        echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: ${RABBITMQ_ADVANCED_CONFIG_FILE}"
+        echo "ERROR: extension should be .config"
+        exit 1
+    else
+        # We should never got here, but still there should be some explanation
+        echo "ERROR: Wrong extension for ${RABBITMQ_CONFIG_ARG_FILE}"
+        echo "ERROR: extension should be .config"
+        exit 1
+    fi
+fi
 
-RABBITMQ_ADVANCED_CONFIG_FILE_NOEX="${RABBITMQ_ADVANCED_CONFIG_FILE%.*}"
-if [ "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
-    RABBITMQ_ADVANCED_CONFIG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}"
+# Set -config if the file exists
+if [ -f "${RABBITMQ_CONFIG_ARG_FILE}" ]; then
+    RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_ARG_FILE_NOEX}"
 fi
 
+# Set -conf and other generated config parameters
+if [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
+    RABBITMQ_GENERATED_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \
+                                   -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
+                                   -conf_script_dir `dirname $0` \
+                                   -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}
+                                   -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE}"
+fi
+
+set +e
+
 # `net_kernel:start/1` will fail in `longnames` mode when erlang is
 # unable to determine FQDN of a node (with a dot in it). But `erl`
 # itself has some magic that still allow it to start when you
@@ -108,18 +212,6 @@ else
     exit ${PRELAUNCH_RESULT}
 fi
 
-if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then
-    mkdir -p "${RABBITMQ_SCHEMA_DIR}"
-fi
-
-if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then
-    mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}"
-fi
-
-if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then
-    cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}"
-fi
-
 # The default allocation strategy RabbitMQ is using was introduced
 # in Erlang/OTP 20.2.3. Earlier Erlang versions fail to start with
 # this configuration. We therefore need to ensure that erl accepts
@@ -141,38 +233,6 @@ fi
 
 set -e
 
-RABBITMQ_CONFIG_FILE_NOEX="${RABBITMQ_CONFIG_FILE%.*}"
-
-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}"
-    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
-else
-    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} \
-                             -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=
 [ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners [{\""${RABBITMQ_NODE_IP_ADDRESS}"\","${RABBITMQ_NODE_PORT}"}]"
 
@@ -230,6 +290,7 @@ start_rabbitmq_server() {
         ${RABBITMQ_NAME_TYPE} ${RABBITMQ_NODENAME} \
         -boot "${SASL_BOOT_FILE}" \
         ${RABBITMQ_CONFIG_ARG} \
+        ${RABBITMQ_GENERATED_CONFIG_ARG} \
         +W w \
         +A ${RABBITMQ_IO_THREAD_POOL_SIZE} \
         ${RABBITMQ_DEFAULT_ALLOC_ARGS} \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index f6a61842fd..8b5ae212ec 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -48,9 +48,97 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 

 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin

 

+if not exist "!RABBITMQ_SCHEMA_DIR!" (

+    mkdir "!RABBITMQ_SCHEMA_DIR!"

+)

+

+if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (

+    mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"

+)

+

+if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (

+    copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"

+)

+

 CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX

-if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config" (

-    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!

+

+if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!" (

+    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config

+    REM Try to create advanced config file, if it doesn't exist

+    REM It still can fail to be created, but at least not for default install

+    if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!" (

+        echo []. > !RABBITMQ_ADVANCED_CONFIG_FILE!

+    )

+)

+

+CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX

+

+if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" (

+    if exist "!RABBITMQ_CONFIG_FILE_NOEX!.config" (

+        if exist "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (

+            rem Both files exist. Print a warning

+            echo "WARNING: Both old (.config) and new (.conf) format config files exist."

+            echo "WARNING: Using the old format config file: !RABBITMQ_CONFIG_FILE_NOEX!.config"

+            echo "WARNING: Please update your config files to the new format and remove the old file"

+        )

+        set RABBITMQ_CONFIG_FILE=!RABBITMQ_CONFIG_FILE_NOEX!.config

+    ) else if exist "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (

+        set RABBITMQ_CONFIG_FILE=!RABBITMQ_CONFIG_FILE_NOEX!.conf

+    ) else (

+        rem No config file exist. Use advanced config for -config arg.

+        if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!" (

+            echo "WARNING: Using RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"

+        )

+        set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE!

+    )

+)

+

+rem Set the -config argument.

+rem The -config argument should not have extension.

+rem the file should exist

+rem the file should be a valid erlang term file

+

+rem Config file extension is .config

+if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE!" (

+    set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_CONFIG_FILE!

+) else if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (

+    set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE!

+) else if not "" == "!RABBITMQ_CONFIG_FILE!" (

+    if not "!RABBITMQ_CONFIG_FILE_NOEX!" == "!RABBITMQ_CONFIG_FILE!" (

+        rem Config file has an extension, but it's neither .conf or .config

+        echo "ERROR: Wrong extension for RABBITMQ_CONFIG_FILE: !RABBITMQ_CONFIG_FILE!"

+        echo "ERROR: extension should be either .conf or .config"

+        exit /B 1

+    )

+)

+

+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX

+

+if not "!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (

+    if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (

+        echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"

+        echo "ERROR: extension should be .config"

+        exit /B 1

+    ) else (

+        rem We should never got here, but still there should be some explanation

+        echo "ERROR: Wrong extension for !RABBITMQ_CONFIG_ARG_FILE!"

+        echo "ERROR: extension should be .config"

+        exit /B 1

+    )

+)

+

+rem Set -config if the file exists

+if exist !RABBITMQ_CONFIG_ARG_FILE! (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"

+)

+

+rem Set -conf and other generated config parameters

+if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (

+    set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^

+                                      -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^

+                                      -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

+                                      -conf_schema_dir "!RABBITMQ_SCHEMA_DIR!" ^

+                                      -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!"

 )

 

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

@@ -93,52 +181,8 @@ if ERRORLEVEL 1 (
     set RABBITMQ_DEFAULT_ALLOC_ARGS=

 )

 

-if not exist "!RABBITMQ_SCHEMA_DIR!" (

-    mkdir "!RABBITMQ_SCHEMA_DIR!"

-)

-

-if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (

-    mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"

-)

-

-if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (

-    copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"

-)

-

 set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"

 

-CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX

-

-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!.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=

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

    if not "!RABBITMQ_NODE_PORT!"=="" (

@@ -146,7 +190,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
    )

 )

 

-REM If $RABBITMQ_LOGS is '-', send all log messages to stdout. This is

+REM If !RABBITMQ_LOGS! is '-', send all log messages to stdout. This is

 REM particularly useful for Docker images.

 

 if "!RABBITMQ_LOGS!" == "-" (

@@ -191,6 +235,7 @@ if "!ENV_OK!"=="false" (
 -boot start_sasl ^

 !RABBITMQ_START_RABBIT! ^

 !RABBITMQ_CONFIG_ARG! ^

+!RABBITMQ_GENERATED_CONFIG_ARG! ^

 !RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^

 +W w ^

 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 0a93462359..445f778ff4 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -131,10 +131,97 @@ if errorlevel 1 (
 

 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin

 

+if not exist "!RABBITMQ_SCHEMA_DIR!" (

+    mkdir "!RABBITMQ_SCHEMA_DIR!"

+)

+

+if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (

+    mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"

+)

+

+if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (

+    copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"

+)

+

 CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX

 

-if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config" (

-    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!

+if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!" (

+    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config

+    REM Try to create advanced config file, if it doesn't exist

+    REM It still can fail to be created, but at least not for default install

+    if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!" (

+        echo []. > !RABBITMQ_ADVANCED_CONFIG_FILE!

+    )

+)

+

+CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX

+

+if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" (

+    if exist "!RABBITMQ_CONFIG_FILE_NOEX!.config" (

+        if exist "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (

+            rem Both files exist. Print a warning

+            echo "WARNING: Both old (.config) and new (.conf) format config files exist."

+            echo "WARNING: Using the old format config file: !RABBITMQ_CONFIG_FILE_NOEX!.config"

+            echo "WARNING: Please update your config files to the new format and remove the old file"

+        )

+        set RABBITMQ_CONFIG_FILE=!RABBITMQ_CONFIG_FILE_NOEX!.config

+    ) else if exist "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (

+        set RABBITMQ_CONFIG_FILE=!RABBITMQ_CONFIG_FILE_NOEX!.conf

+    ) else (

+        rem No config file exist. Use advanced config for -config arg.

+        if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!" (

+            echo "WARNING: Using RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"

+        )

+        set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE!

+    )

+)

+

+rem Set the -config argument.

+rem The -config argument should not have extension.

+rem the file should exist

+rem the file should be a valid erlang term file

+

+rem Config file extension is .config

+if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE!" (

+    set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_CONFIG_FILE!

+) else if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (

+    set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE!

+) else if not "" == "!RABBITMQ_CONFIG_FILE!" (

+    if not "!RABBITMQ_CONFIG_FILE_NOEX!" == "!RABBITMQ_CONFIG_FILE!" (

+        rem Config file has an extension, but it's neither .conf or .config

+        echo "ERROR: Wrong extension for RABBITMQ_CONFIG_FILE: !RABBITMQ_CONFIG_FILE!"

+        echo "ERROR: extension should be either .conf or .config"

+        exit /B 1

+    )

+)

+

+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX

+

+if not "!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (

+    if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (

+        echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"

+        echo "ERROR: extension should be .config"

+        exit /B 1

+    ) else (

+        rem We should never got here, but still there should be some explanation

+        echo "ERROR: Wrong extension for !RABBITMQ_CONFIG_ARG_FILE!"

+        echo "ERROR: extension should be .config"

+        exit /B 1

+    )

+)

+

+rem Set -config if the file exists

+if exist !RABBITMQ_CONFIG_ARG_FILE! (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"

+)

+

+rem Set -conf and other generated config parameters

+if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (

+    set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^

+                                      -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^

+                                      -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

+                                      -conf_schema_dir "!RABBITMQ_SCHEMA_DIR!" ^

+                                      -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!"

 )

 

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

@@ -181,57 +268,6 @@ if ERRORLEVEL 1 (
     set RABBITMQ_DEFAULT_ALLOC_ARGS=

 )

 

-if not exist "!RABBITMQ_SCHEMA_DIR!" (

-    mkdir "!RABBITMQ_SCHEMA_DIR!"

-)

-

-if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (

-    mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"

-)

-

-if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (

-    copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"

-)

-    REM Try to create advanced config file, if it doesn't exist

-    REM It still can fail to be created, but at least not for default install

-if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (

-    echo []. > !RABBITMQ_ADVANCED_CONFIG_FILE!.config

-)

-

-CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX

-

-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 (

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

-        )

-    )

-)

-

 

 set RABBITMQ_LISTEN_ARG=

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

@@ -273,6 +309,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 -boot start_sasl ^

 !RABBITMQ_START_RABBIT! ^

 !RABBITMQ_CONFIG_ARG! ^

+!RABBITMQ_GENERATED_CONFIG_ARG! ^

 +W w ^

 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^

 !RABBITMQ_DEFAULT_ALLOC_ARGS! ^