yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(bin/emqx): fail fast if cookie is obviously wrong

This commit is contained in:
Zaiming (Stone) Shi 2023-02-21 20:29:30 +01:00
parent 4cc92c0368
commit 8d480a1dc9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/emqx
View File

@ -545,6 +545,10 @@ else
logerr "Make sure environment variable EMQX_NODE__NAME is set to indicate for which node this command is intended." logerr "Make sure environment variable EMQX_NODE__NAME is set to indicate for which node this command is intended."
exit 1 exit 1
fi fi
else
if [ -n "${EMQX_NODE__NAME:-}" ]; then
die "Node $EMQX_NODE__NAME is not running?"
fi
fi fi
## We have no choiece but to read the bootstrap config (with environment overrides available in the current shell) ## We have no choiece but to read the bootstrap config (with environment overrides available in the current shell)
[ -f "$EMQX_ETC_DIR"/emqx.conf ] || die "emqx.conf is not found in $EMQX_ETC_DIR" 1 [ -f "$EMQX_ETC_DIR"/emqx.conf ] || die "emqx.conf is not found in $EMQX_ETC_DIR" 1
@ -940,9 +944,11 @@ if [ -n "${EMQX_NODE_COOKIE:-}" ]; then
unset EMQX_NODE_COOKIE unset EMQX_NODE_COOKIE
fi fi
COOKIE="${EMQX_NODE__COOKIE:-}" COOKIE="${EMQX_NODE__COOKIE:-}"
if [ -z "$COOKIE" ]; then COOKIE_IN_USE="$(get_boot_config 'node.cookie')"
COOKIE="$(get_boot_config 'node.cookie')" if [ -n "$COOKIE_IN_USE" ] && [ -n "$COOKIE" ] && [ "$COOKIE" != "$COOKIE_IN_USE" ]; then
die "EMQX_NODE__COOKIE is different from the cookie used by $NAME"
fi fi
[ -z "$COOKIE" ] && COOKIE="$COOKIE_IN_USE"
[ -z "$COOKIE" ] && COOKIE="$EMQX_DEFAULT_ERLANG_COOKIE" [ -z "$COOKIE" ] && COOKIE="$EMQX_DEFAULT_ERLANG_COOKIE"
maybe_warn_default_cookie() { maybe_warn_default_cookie() {