diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-31 10:13:26 +0100 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-04-05 21:32:12 +0300 |
| commit | 06fa298aacb9826a68224c123abb24c2cdabad22 (patch) | |
| tree | 2859c0ff0cbc69303fea79081112873d320f0abe /scripts/rabbitmq-server | |
| parent | e3b856330562951fff07767ba82ccd03b13a19a4 (diff) | |
| download | rabbitmq-server-git-06fa298aacb9826a68224c123abb24c2cdabad22.tar.gz | |
Condition ordering to set RABBITMQ_CONFIG_ARG
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 65bca88844..62fb7b05fd 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -77,7 +77,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -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 @@ -119,11 +119,11 @@ elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" == "${RABBITMQ_CONFIG_FILE}" ]; then -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \ -config ${RABBITMQ_ADVANCED_CONFIG_FILE}" fi -elif [ "${RABBITMQ_CONFIG_FILE_NOEX}" == "${RABBITMQ_CONFIG_FILE}" ]; then +else if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then - RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}" + RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}" elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then - RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \ + RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \ -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \ -conf_script_dir `dirname $0` \ -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}" |