Merge pull request #575 from rabbitmq/rabbitmq-server-550

Support new configuration format

8 files changed, 106 insertions, 14 deletions

diff --git a/scripts/cuttlefish b/scripts/cuttlefish
new file mode 100755
index 0000000000..6c1e4bbb89
--- /dev/null
+++ b/scripts/cuttlefish
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index c5d87822a2..bccd0d7435 100644
--- a/scripts/rabbitmq-defaults
+++ b/scripts/rabbitmq-defaults
@@ -38,6 +38,9 @@ CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
 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
+SCHEMA_DIR=${RABBITMQ_HOME}/priv/schema
 
 PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
 IO_THREAD_POOL_SIZE=64
diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat
index 27edd0d11e..5612af967a 100644
--- a/scripts/rabbitmq-defaults.bat
+++ b/scripts/rabbitmq-defaults.bat
@@ -41,6 +41,9 @@ set CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq
 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 SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema

 

 REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"

 for /f "delims=" %%F in ("!TDP0!..\plugins") do set PLUGINS_DIR=%%~dpsF%%~nF%%~xF

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 2a0d48085b..8ceb8c94f2 100644
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -184,6 +184,9 @@ DEFAULT_NODE_PORT=5672
 [ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS}
 [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR}
 [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}
+[ "x" = "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && RABBITMQ_GENERATED_CONFIG_DIR=${GENERATED_CONFIG_DIR}
+[ "x" = "x$RABBITMQ_ADVANCED_CONFIG_FILE" ] && RABBITMQ_ADVANCED_CONFIG_FILE=${ADVANCED_CONFIG_FILE}
+[ "x" = "x$RABBITMQ_SCHEMA_DIR" ] && RABBITMQ_SCHEMA_DIR=${SCHEMA_DIR}
 
 rmq_normalize_path_var \
     RABBITMQ_CONFIG_FILE \
@@ -258,7 +261,8 @@ if [ "${RABBITMQ_DEV_ENV}" ]; then
             RABBITMQ_ENABLED_PLUGINS_FILE="${enabled_plugins_file}"
         fi
     fi
-
+    
+    
     if [ -d "${RABBITMQ_PLUGINS_DIR}" ]; then
         # RabbitMQ was started with "make run-broker" from its own
         # source tree. Take rabbit_common from the plugins directory.
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 2cb3a985de..430395accf 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -77,8 +77,8 @@ 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.

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

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

         set HOSTNAME=

@@ -158,6 +158,31 @@ if "!RABBITMQ_CONFIG_FILE!"=="" (
     )

 )

 

+if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (

+    if "!GENERATED_CONFIG_DIR!"=="" (

+        set RABBITMQ_GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config

+    ) else (

+        set RABBITMQ_GENERATED_CONFIG_DIR=!GENERATED_CONFIG_DIR!

+    )

+)

+

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

+    if "!ADVANCED_CONFIG_FILE!"=="" (

+        set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced

+    ) else (

+        set RABBITMQ_ADVANCED_CONFIG_FILE=!GENERATED_CONFIG_DIR!

+    )

+)

+

+if "!RABBITMQ_SCHEMA_DIR!" == "" (

+    if "!SCHEMA_DIR!"=="" (

+        set RABBITMQ_SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema

+    ) else (

+        set RABBITMQ_SCHEMA_DIR=!SCHEMA_DIR!

+    )

+)

+

+

 REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}

 if "!RABBITMQ_LOG_BASE!"=="" (

     if "!LOG_BASE!"=="" (

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index cb341dc09c..0e3f06baf9 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -73,8 +73,11 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
     -hidden \
     -s rabbit_prelaunch \
     ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \
+    -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \
+    -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
@@ -86,10 +89,25 @@ else
     exit ${PRELAUNCH_RESULT}
 fi
 
+if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then
+    cp "${RABBITMQ_HOME}/priv/schema/rabbitmq.schema" "${RABBITMQ_SCHEMA_DIR}"
+fi
+
 set -e
 
-RABBITMQ_CONFIG_ARG=
-[ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
+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
 
 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}"}]"
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 428f319bfa..33e316a07f 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -21,6 +21,7 @@ rem Preserve values that might contain exclamation marks before
 rem enabling delayed expansion

 set TDP0=%~dp0

 set STAR=%*

+set CONF_SCRIPT_DIR="%~dp0"

 setlocal enabledelayedexpansion

 

 REM Get default settings with user overrides for (RABBITMQ_)<var_name>

@@ -41,11 +42,16 @@ 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 ^

         -s rabbit_prelaunch ^

         !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9! ^

+        -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!"  ^

+        -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

+        -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^

         -extra "!RABBITMQ_NODENAME!"

 

 if ERRORLEVEL 2 (

@@ -56,13 +62,25 @@ if ERRORLEVEL 2 (
     set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!

 )

 

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

+    copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!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 (

-    set RABBITMQ_CONFIG_ARG=

-)

+) 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!"=="" (

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 762360bafc..f302087f91 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -21,6 +21,7 @@ rem Preserve values that might contain exclamation marks before
 rem enabling delayed expansion

 set TN0=%~n0

 set TDP0=%~dp0

+set CONF_SCRIPT_DIR="%~dp0"

 set P1=%1

 setlocal enabledelayedexpansion

 

@@ -123,10 +124,16 @@ if errorlevel 1 (
 

 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 ^

         -s rabbit_prelaunch ^

+        -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

+        -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

+        -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^

         !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!

 

 if ERRORLEVEL 3 (

@@ -141,16 +148,28 @@ if ERRORLEVEL 3 (
     set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!

 )

 

-    REM Try to create 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_CONFIG_FILE!.config" (

-    echo []. > !RABBITMQ_CONFIG_FILE!.config

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

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

+    REM Try to create 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_CONFIG_FILE!.config" (
+    echo []. > !RABBITMQ_CONFIG_FILE!.config
 )

 

 if exist "!RABBITMQ_CONFIG_FILE!.config" (

     set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

-    set RABBITMQ_CONFIG_ARG=

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

@@ -207,6 +226,8 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 !RABBITMQ_DIST_ARG! ^

 !STARVAR!

 

+echo "!ERLANG_SERVICE_ARGUMENTS!" > "!RABBITMQ_CONFIG_FILE!.txt"

+

 set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!

 set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!