From d4aba52e1683b72fee80ccaac8862ef718eaa7db Mon Sep 17 00:00:00 2001 From: firest Date: Fri, 1 Sep 2023 18:03:45 +0800 Subject: [PATCH] chore(dev): support the EMQX_NODE__NAME variable --- dev | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev b/dev index 20cd66569..7768fbcf6 100755 --- a/dev +++ b/dev @@ -43,7 +43,7 @@ OPTIONS: -c|--compile: Force recompile, otherwise starts with the already built libs in '_build/\$PROFILE/lib/'. -e|--ekka-epmd: Force to use ekka_epmd. - -n|--name: Node name, defaults to \$EMQX_NODE_NAME env. + -n|--name: Node name, defaults to \$EMQX_NODE__NAME or the \$EMQX_NODE_NAME env. ENVIRONMENT VARIABLES: @@ -63,7 +63,7 @@ export HOCON_ENV_OVERRIDE_PREFIX='EMQX_' export EMQX_LOG__FILE__DEFAULT__ENABLE='false' export EMQX_LOG__CONSOLE__ENABLE='true' SYSTEM="$(./scripts/get-distro.sh)" -EMQX_NODE_NAME="${EMQX_NODE_NAME:-emqx@127.0.0.1}" +EMQX_NODE_NAME="${EMQX_NODE__NAME:-${EMQX_NODE_NAME:-emqx@127.0.0.1}}" PROFILE="${PROFILE:-emqx}" FORCE_COMPILE=0 # Do not start using ekka epmd by default, so your IDE can connect to it @@ -158,7 +158,7 @@ export EMQX_LOG_DIR="$BASE_DIR/log" export EMQX_PLUGINS__INSTALL_DIR="${EMQX_PLUGINS__INSTALL_DIR:-$BASE_DIR/plugins}" CONFIGS_DIR="$EMQX_DATA_DIR/configs" # Use your cookie so your IDE can connect to it. -COOKIE="${EMQX_NODE__COOKIE:-${EMQX_NODE_COOKIE:-$(cat ~/.erlang.cookie || echo 'emqxsecretcookie')}}" +COOKIE="${EMQX_NODE__COOKIE:-${EMQX_NODE_COOKIE:-$(cat ~/.erlang.cookie 2>/dev/null || echo 'emqxsecretcookie')}}" mkdir -p "$EMQX_ETC_DIR" "$EMQX_DATA_DIR/patches" "$EMQX_DATA_DIR/plugins" "$EMQX_DATA_DIR/certs" "$EMQX_LOG_DIR" "$CONFIGS_DIR" if [ $EKKA_EPMD -eq 1 ]; then EPMD_ARGS='-start_epmd false -epmd_module ekka_epmd'