diff options
| author | Gerhard Lazu <gerhard@users.noreply.github.com> | 2017-08-22 20:17:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 20:17:30 +0200 |
| commit | 4e94918a957bfee5905e75c89c14e2e7e9b74600 (patch) | |
| tree | c92c58b155a00fc1555f4b9fd43c86e5e9ccfac0 /scripts | |
| parent | b02a53eebde065e51e0dc9c4041756950003b0a2 (diff) | |
| parent | c89e694abddc7df23ec1da180ddfbfe4909e97ab (diff) | |
| download | rabbitmq-server-git-4e94918a957bfee5905e75c89c14e2e7e9b74600.tar.gz | |
Merge pull request #1339 from rabbitmq/rabbitmq-server-1338
Read rabbitmq-env.conf a bit earlier to pick up two variables
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 52fb4034b0..8cc3af56ae 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -76,6 +76,10 @@ RABBITMQ_HOME="$(rmq_realpath "${RABBITMQ_SCRIPTS_DIR}/..")" ## Set defaults . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults +## Get configuration variables from the configure environment file +[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE} +[ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true + DEFAULT_SCHEDULER_BIND_TYPE="db" [ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE} @@ -90,11 +94,6 @@ SERVER_ERL_ARGS="+P 1048576 +t 5000000 +stbt $RABBITMQ_SCHEDULER_BIND_TYPE +zdbb # it and warn the user. saved_RABBITMQ_PID_FILE=$RABBITMQ_PID_FILE -## Get configuration variables from the configure environment file -[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE} - -[ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true - if [ "$saved_RABBITMQ_PID_FILE" -a \ "$saved_RABBITMQ_PID_FILE" != "$RABBITMQ_PID_FILE" ]; then echo "WARNING: RABBITMQ_PID_FILE was already set by the init script to:" 1>&2 |