Skip to content

Commit c4b1f36

Browse files
lukebakkenlukebakken
committed
Variables in rabbitmq-env.conf and rabbitmq-env-conf.bat do not begin with RABBITMQ_, adjust Unix and Windows files accordingly
1 parent b1e163f commit c4b1f36

File tree

3 files changed

+41
-31
lines changed

3 files changed

+41
-31
lines changed

‎scripts/rabbitmq-env‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,20 @@ ESCRIPT_DIR="${RABBITMQ_HOME}/escript"
8282
[ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true
8383

8484
DEFAULT_SCHEDULER_BIND_TYPE="db"
85-
[ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}
85+
[ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE="$SCHEDULER_BIND_TYPE"
86+
[ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE="$DEFAULT_SCHEDULER_BIND_TYPE"
8687

8788
DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
88-
[ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}
89+
[ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE="$DISTRIBUTION_BUFFER_SIZE"
90+
[ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE="$DEFAULT_DISTRIBUTION_BUFFER_SIZE"
8991

9092
DEFAULT_MAX_NUMBER_OF_PROCESSES=1048576
91-
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] && RABBITMQ_MAX_NUMBER_OF_PROCESSES=="${DEFAULT_MAX_NUMBER_OF_PROCESSES}"
93+
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] && RABBITMQ_MAX_NUMBER_OF_PROCESSES="$MAX_NUMBER_OF_PROCESSES"
94+
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] && RABBITMQ_MAX_NUMBER_OF_PROCESSES="$DEFAULT_MAX_NUMBER_OF_PROCESSES"
9295

9396
DEFAULT_MAX_NUMBER_OF_ATOMS=5000000
94-
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS=="${DEFAULT_MAX_NUMBER_OF_ATOMS}"
97+
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS="$MAX_NUMBER_OF_ATOMS"
98+
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS="$DEFAULT_MAX_NUMBER_OF_ATOMS"
9599

96100
## Common server defaults
97101
SERVER_ERL_ARGS="+P $RABBITMQ_MAX_NUMBER_OF_PROCESSES +t $RABBITMQ_MAX_NUMBER_OF_ATOMS +stbt $RABBITMQ_SCHEDULER_BIND_TYPE +zdbbl $RABBITMQ_DISTRIBUTION_BUFFER_SIZE"

‎scripts/rabbitmq-env.bat‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,45 +27,51 @@ if not defined ERLANG_HOME (
2727
)
2828

2929
REM ## Set defaults
30-
REM . ${SCRIPT_DIR}/rabbitmq-defaults
3130
call "%SCRIPT_DIR%\rabbitmq-defaults.bat"
3231

33-
set DEFAULT_SCHEDULER_BIND_TYPE=db
32+
if "!RABBITMQ_CONF_ENV_FILE!"=="" (
33+
set RABBITMQ_CONF_ENV_FILE=!CONF_ENV_FILE!
34+
)
3435

35-
REM [ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}
36-
REM set the default scheduling bind type
36+
if exist "!RABBITMQ_CONF_ENV_FILE!" (
37+
call "!RABBITMQ_CONF_ENV_FILE!"
38+
)
39+
40+
set DEFAULT_SCHEDULER_BIND_TYPE=db
41+
if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (
42+
set RABBITMQ_SCHEDULER_BIND_TYPE=!SCHEDULER_BIND_TYPE!
43+
)
3744
if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (
3845
set RABBITMQ_SCHEDULER_BIND_TYPE=!DEFAULT_SCHEDULER_BIND_TYPE!
3946
)
4047

41-
REM DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
42-
REM set the VM distribution buffer size
43-
REM [ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}
4448
set DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
49+
if "!RABBITMQ_DISTRIBUTION_BUFFER_SIZE!"=="" (
50+
set RABBITMQ_DISTRIBUTION_BUFFER_SIZE=!DISTRIBUTION_BUFFER_SIZE!
51+
)
4552
if "!RABBITMQ_DISTRIBUTION_BUFFER_SIZE!"=="" (
4653
set RABBITMQ_DISTRIBUTION_BUFFER_SIZE=!DEFAULT_DISTRIBUTION_BUFFER_SIZE!
4754
)
4855

49-
REM # warn about old rabbitmq.conf file, if no new one
50-
REM if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
51-
REM [ ! -f ${CONF_ENV_FILE} ] ; then
52-
REM echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "
53-
REM echo "location has moved to ${CONF_ENV_FILE}"
54-
REM fi
55-
56-
REM Common defaults
57-
set SERVER_ERL_ARGS=+P 1048576 +t 5000000 +stbt !RABBITMQ_SCHEDULER_BIND_TYPE! +zdbbl !RABBITMQ_DISTRIBUTION_BUFFER_SIZE!
58-
59-
REM ## Get configuration variables from the configure environment file
60-
REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true
61-
if "!RABBITMQ_CONF_ENV_FILE!"=="" (
62-
set RABBITMQ_CONF_ENV_FILE=!CONF_ENV_FILE!
56+
set DEFAULT_MAX_NUMBER_OF_PROCESSES=1048576
57+
if "!RABBITMQ_MAX_NUMBER_OF_PROCESSES!"=="" (
58+
set RABBITMQ_MAX_NUMBER_OF_PROCESSES=!MAX_NUMBER_OF_PROCESSES!
59+
)
60+
if "!RABBITMQ_MAX_NUMBER_OF_PROCESSES!"=="" (
61+
set RABBITMQ_MAX_NUMBER_OF_PROCESSES=!DEFAULT_MAX_NUMBER_OF_PROCESSES!
6362
)
6463

65-
if exist "!RABBITMQ_CONF_ENV_FILE!" (
66-
call "!RABBITMQ_CONF_ENV_FILE!"
64+
set DEFAULT_MAX_NUMBER_OF_ATOMS=5000000
65+
if "!RABBITMQ_MAX_NUMBER_OF_ATOMS!"=="" (
66+
set RABBITMQ_MAX_NUMBER_OF_ATOMS=!MAX_NUMBER_OF_ATOMS!
67+
)
68+
if "!RABBITMQ_MAX_NUMBER_OF_ATOMS!"=="" (
69+
set RABBITMQ_MAX_NUMBER_OF_ATOMS=!DEFAULT_MAX_NUMBER_OF_ATOMS!
6770
)
6871

72+
REM Common defaults
73+
set SERVER_ERL_ARGS=+P 1048576 +t 5000000 +stbt !RABBITMQ_SCHEDULER_BIND_TYPE! +zdbbl !RABBITMQ_DISTRIBUTION_BUFFER_SIZE!
74+
6975
REM Make sure $RABBITMQ_BASE contains no non-ASCII characters.
7076
if not exist "!RABBITMQ_BASE!" (
7177
mkdir "!RABBITMQ_BASE!"

‎test/rabbitmq-env.bats‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts"
33
export RABBITMQ_SCRIPTS_DIR="$scripts_dir"
44
export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf"
5-
echo 'RABBITMQ_SCHEDULER_BIND_TYPE=u' > "$RABBITMQ_CONF_ENV_FILE"
5+
echo 'SCHEDULER_BIND_TYPE=u' > "$RABBITMQ_CONF_ENV_FILE"
66
source "$scripts_dir/rabbitmq-env"
77
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain '+stbt u', but got: $RABBITMQ_SERVER_ERL_ARGS"
88
[[ $RABBITMQ_SERVER_ERL_ARGS == *+stbt\ u* ]]
@@ -12,7 +12,7 @@
1212
declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts"
1313
export RABBITMQ_SCRIPTS_DIR="$scripts_dir"
1414
export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf"
15-
echo 'RABBITMQ_DISTRIBUTION_BUFFER_SIZE=123456' > "$RABBITMQ_CONF_ENV_FILE"
15+
echo 'DISTRIBUTION_BUFFER_SIZE=123456' > "$RABBITMQ_CONF_ENV_FILE"
1616
source "$scripts_dir/rabbitmq-env"
1717
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain '+zdbbl 123456', but got: $RABBITMQ_SERVER_ERL_ARGS"
1818
[[ $RABBITMQ_SERVER_ERL_ARGS == *+zdbbl\ 123456* ]]
@@ -22,7 +22,7 @@
2222
declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts"
2323
export RABBITMQ_SCRIPTS_DIR="$scripts_dir"
2424
export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf"
25-
echo 'RABBITMQ_MAX_NUMBER_OF_PROCESSES=2000000' > "$RABBITMQ_CONF_ENV_FILE"
25+
echo 'MAX_NUMBER_OF_PROCESSES=2000000' > "$RABBITMQ_CONF_ENV_FILE"
2626
source "$scripts_dir/rabbitmq-env"
2727
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain '+P 2000000', but got: $RABBITMQ_SERVER_ERL_ARGS"
2828
[[ $RABBITMQ_SERVER_ERL_ARGS == *+P\ 2000000* ]]
@@ -32,7 +32,7 @@
3232
declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts"
3333
export RABBITMQ_SCRIPTS_DIR="$scripts_dir"
3434
export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf"
35-
echo 'RABBITMQ_MAX_NUMBER_OF_ATOMS=10000000' > "$RABBITMQ_CONF_ENV_FILE"
35+
echo 'MAX_NUMBER_OF_ATOMS=10000000' > "$RABBITMQ_CONF_ENV_FILE"
3636
source "$scripts_dir/rabbitmq-env"
3737
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain '+t 10000000', but got: $RABBITMQ_SERVER_ERL_ARGS"
3838
[[ $RABBITMQ_SERVER_ERL_ARGS == *+t\ 10000000* ]]

0 commit comments

Comments
 (0)