diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2020-06-25 06:20:23 -0700 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-06-30 10:23:29 +0200 |
| commit | eafa2aa482ac806055c967e15af0ca554d152810 (patch) | |
| tree | 6492b3ebf1d5cea29acf48aa6b0fcf9dca101589 /scripts/rabbitmq-env | |
| parent | a58da8fad0cdb091436e8c28beb7f68a1c9e370f (diff) | |
| download | rabbitmq-server-git-eafa2aa482ac806055c967e15af0ca554d152810.tar.gz | |
Re-enable CTL_ERL_ARGS and dist port settings
Fixes #2394
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 214285a9af..6d515dc504 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -133,7 +133,12 @@ SERVER_ERL_ARGS=" +P $RABBITMQ_MAX_NUMBER_OF_PROCESSES +t $RABBITMQ_MAX_NUMBER_O ##--- Set environment vars RABBITMQ_<var_name> to defaults if not set -# FIXME +[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS="$CTL_ERL_ARGS" +[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MIN" ] && RABBITMQ_CTL_DIST_PORT_MIN="$CTL_DIST_PORT_MIN" +[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MAX" ] && RABBITMQ_CTL_DIST_PORT_MAX="$CTL_DIST_PORT_MAX" +[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MIN" ] && RABBITMQ_CTL_DIST_PORT_MIN='35672' +[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MAX" ] && RABBITMQ_CTL_DIST_PORT_MAX="$(($RABBITMQ_CTL_DIST_PORT_MIN + 10))" + [ "x" = "x$RABBITMQ_IO_THREAD_POOL_SIZE" ] && RABBITMQ_IO_THREAD_POOL_SIZE=${IO_THREAD_POOL_SIZE} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS} @@ -182,6 +187,8 @@ run_escript() -boot "$CLEAN_BOOT_FILE" \ -noinput -noshell -hidden -smp enable \ $RABBITMQ_CTL_ERL_ARGS \ + -kernel inet_dist_listen_min "$RABBITMQ_CTL_DIST_PORT_MIN" \ + -kernel inet_dist_listen_max "$RABBITMQ_CTL_DIST_PORT_MAX" \ -run escript start \ -escript main "$escript_main" \ -extra "$escript" "$@" |