diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 11:24:13 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 11:24:13 +0000 |
| commit | a1c765da79f81c8e07191fccb4aecb14819eeb1f (patch) | |
| tree | bdc03d27caa99394eafd1872e90e5a2d3e496725 /scripts/rabbitmq-server | |
| parent | d0bc71dba5a07786d4f9d71445b55276bfb12846 (diff) | |
| download | rabbitmq-server-git-a1c765da79f81c8e07191fccb4aecb14819eeb1f.tar.gz | |
Use advanced config as inittial config. Extract plugin schemas
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 9f70c7f992..e1939e214a 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -71,6 +71,8 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -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\"" \ -extra "${RABBITMQ_NODENAME}" PRELAUNCH_RESULT=$? @@ -92,8 +94,12 @@ 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_advanced ${RABBITMQ_CONFIG_ADVANCED} \ -conf_schema_dir ${RABBITMQ_HOME}/priv/schema" + if [ -f "${RABBITMQ_CONFIG_ADVANCED}.config" ]; then + RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \ + -conf_advanced ${RABBITMQ_CONFIG_ADVANCED} \ + -conf ${RABBITMQ_CONFIG_ADVANCED}" + fi fi RABBITMQ_LISTEN_ARG= @@ -116,6 +122,7 @@ fi set -f start_rabbitmq_server() { + RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ exec ${ERL_DIR}erl \ -pa ${RABBITMQ_EBIN_ROOT} \ |