diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:30:38 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:30:38 +0000 |
| commit | aa8d7f00d3ae279a0bac46137933540b009aa86d (patch) | |
| tree | 47b1637f3df7d8f895ba2b5f85f8f92f35232327 /scripts | |
| parent | 32b59f88115699f139a15621aaa36c01542c20fe (diff) | |
| download | rabbitmq-server-git-aa8d7f00d3ae279a0bac46137933540b009aa86d.tar.gz | |
Do not generate config in prelaunch. Copy rabbitmq.schema to SCHEMA_DIR
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 6 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 7 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 7 |
3 files changed, 12 insertions, 8 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 (
|