diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2018-10-11 13:30:49 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2018-10-11 13:41:23 -0700 |
| commit | 4077b836de8f0c8a9e1dec580d78a1ef93cd1899 (patch) | |
| tree | 8d5f158f1c9f9d70c306818c4be6d38d6c88d829 | |
| parent | 100e7e10f7913d05fb08bfe7442ea84f03b130aa (diff) | |
| download | rabbitmq-server-git-4077b836de8f0c8a9e1dec580d78a1ef93cd1899.tar.gz | |
Ensure EPMD env vars are exported if set
Fixes #1709
| -rwxr-xr-x | scripts/rabbitmq-env | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index d3348620ed..ea4d0c8832 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -120,6 +120,9 @@ saved_RABBITMQ_PID_FILE="$RABBITMQ_PID_FILE" [ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE} [ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true +[ -n "$ERL_EPMD_PORT" ] && export ERL_EPMD_PORT +[ -n "$ERL_EPMD_ADDRESS" ] && export ERL_EPMD_ADDRESS + DEFAULT_SCHEDULER_BIND_TYPE="db" [ -n "$SCHEDULER_BIND_TYPE" ] || SCHEDULER_BIND_TYPE="$DEFAULT_SCHEDULER_BIND_TYPE" [ -n "$RABBITMQ_SCHEDULER_BIND_TYPE" ] || RABBITMQ_SCHEDULER_BIND_TYPE="$SCHEDULER_BIND_TYPE" @@ -391,15 +394,17 @@ run_escript() escript="${1:?escript must be defined}" shift + # Important: do not quote RABBITMQ_CTL_ERL_ARGS as they must be + # word-split # shellcheck disable=SC2086 exec "${ERL_DIR}erl" +B \ - -boot "${CLEAN_BOOT_FILE}" \ + -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" \ -sasl errlog_type error \ - -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ + -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \ -nodename "$RABBITMQ_NODENAME" \ -run escript start \ -escript main "$escript_main" \ |