Do not generate config in prelaunch. Copy rabbitmq.schema to SCHEMA_DIR

5 files changed, 17 insertions, 16 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 088379d20d..da76b4708e 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -68,8 +68,6 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
     -hidden \
     -s rabbit_prelaunch \
     ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \
-    -conf_dir "${RABBITMQ_GENERATED_CONFIG_DIR}" \
-    -conf_script_dir "`dirname $0`" \
     -conf_advanced "${RABBITMQ_CONFIG_ADVANCED}" \
     -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \
     -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
@@ -86,6 +84,10 @@ 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
 
 if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 89c9afd1e8..2073fe0ed7 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -49,10 +49,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"
         -noinput -hidden ^

         -s rabbit_prelaunch ^

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

-        -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

-        -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

         -conf_advanced "!RABBITMQ_CONFIG_ADVANCED!"  ^

-        -conf_schema_dir !RABBITMQ_SCHEMA_DIR! ^

         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

         -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^

         -extra "!RABBITMQ_NODENAME!"

@@ -65,6 +62,10 @@ 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" (

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 7456ade1c0..29823db2f1 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -121,10 +121,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"
         -pa "!RABBITMQ_EBIN_ROOT!" ^

         -noinput -hidden ^

         -s rabbit_prelaunch ^

-        -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

-        -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

         -conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^

-        -conf_schema_dir !RABBITMQ_SCHEMA_DIR! ^

         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

         -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^

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

@@ -141,6 +138,10 @@ if ERRORLEVEL 3 (
     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"

+)

+

 if exist "!RABBITMQ_CONFIG_FILE!.config" (

     set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl
index 6ff0ec67dc..2cdf19793a 100644
--- a/src/rabbit_config.erl
+++ b/src/rabbit_config.erl
@@ -6,7 +6,8 @@
          prepare_config/1,
          update_app_config/1,
          schema_dir/0,
-         config_files/0
+         config_files/0,
+         get_advanced_config/0
         ]).
 
 prepare_and_use_config() ->
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 9657a3e38a..3f83a153ea 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -102,13 +102,9 @@ get_config(File) ->
     case rabbit_file:is_file(File ++ ".config") of
         true  -> file:consult(File ++ ".config");
         false ->
-            case rabbit_file:is_file(File ++ ".conf") of
-                true ->
-                    case rabbit_config:prepare_config([[File]]) of
-                        {ok, ConfigFile} -> file:consult(ConfigFile);
-                        _                -> {error, generation_error}
-                    end;
-                false -> {error, enoent}
+            case rabbit_config:get_advanced_config() of
+                none     -> {error, enoent};
+                FileName -> file:consult(FileName)
             end
     end.