diff options
| author | Gerhard Lazu <gerhard@rabbitmq.com> | 2017-08-22 09:52:24 -0700 |
|---|---|---|
| committer | Gerhard Lazu <gerhard@lazu.co.uk> | 2017-08-22 19:13:29 +0100 |
| commit | 42b8137f316a887c07a7d711b2f08534fc5d414c (patch) | |
| tree | beb0bc823c3e83180ed9df7e4e817bc210f0c595 | |
| parent | b02a53eebde065e51e0dc9c4041756950003b0a2 (diff) | |
| download | rabbitmq-server-git-42b8137f316a887c07a7d711b2f08534fc5d414c.tar.gz | |
Read rabbitmq-env.conf a bit earlier to pick up two variables
Prior to this change, setting RABBITMQ_DISTRIBUTION_BUFFER_SIZE
and/or RABBITMQ_SCHEDULER_BIND_TYPE would not be added to
SERVER_ERL_ARGS because the latter variable was built prior to
reading rabbitmq-env.conf
Fixes #1338
[#150452491]
Signed-off-by: Luke Bakken <lbakken@pivotal.io>
| -rwxr-xr-x | scripts/rabbitmq-env | 9 | ||||
| -rw-r--r-- | test/rabbitmq-env.bats | 19 |
2 files changed, 23 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 diff --git a/test/rabbitmq-env.bats b/test/rabbitmq-env.bats new file mode 100644 index 0000000000..cbe4a27765 --- /dev/null +++ b/test/rabbitmq-env.bats @@ -0,0 +1,19 @@ +@test "can set RABBITMQ_SCHEDULER_BIND_TYPE from rabbitmq-env.conf" { + declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts" + export RABBITMQ_SCRIPTS_DIR="$scripts_dir" + export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf" + echo 'RABBITMQ_SCHEDULER_BIND_TYPE=u' > "$RABBITMQ_CONF_ENV_FILE" + source "$scripts_dir/rabbitmq-env" + echo "expect RABBITMQ_SERVER_ERL_ARGS to contain '+stbt u' but got '$SERVER_ERL_ARGS'" + [[ $RABBITMQ_SERVER_ERL_ARGS == *+stbt\ u* ]] +} + +@test "can set RABBITMQ_DISTRIBUTION_BUFFER_SIZE from rabbitmq-env.conf" { + declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts" + export RABBITMQ_SCRIPTS_DIR="$scripts_dir" + export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf" + echo 'RABBITMQ_DISTRIBUTION_BUFFER_SIZE=123456' > "$RABBITMQ_CONF_ENV_FILE" + source "$scripts_dir/rabbitmq-env" + echo "expect RABBITMQ_SERVER_ERL_ARGS to contain '+zdbbl 123456' but got '$SERVER_ERL_ARGS'" + [[ $RABBITMQ_SERVER_ERL_ARGS == *+zdbbl\ 123456* ]] +} |