Explorar o código

chore(dev): support the EMQX_NODE__NAME variable

firest %!s(int64=2) %!d(string=hai) anos
pai
achega
d4aba52e16
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      dev

+ 3 - 3
dev

@@ -43,7 +43,7 @@ OPTIONS:
   -c|--compile:      Force recompile, otherwise starts with the already built libs
   -c|--compile:      Force recompile, otherwise starts with the already built libs
                      in '_build/\$PROFILE/lib/'.
                      in '_build/\$PROFILE/lib/'.
   -e|--ekka-epmd:    Force to use ekka_epmd.
   -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:
 ENVIRONMENT VARIABLES:
 
 
@@ -63,7 +63,7 @@ export HOCON_ENV_OVERRIDE_PREFIX='EMQX_'
 export EMQX_LOG__FILE__DEFAULT__ENABLE='false'
 export EMQX_LOG__FILE__DEFAULT__ENABLE='false'
 export EMQX_LOG__CONSOLE__ENABLE='true'
 export EMQX_LOG__CONSOLE__ENABLE='true'
 SYSTEM="$(./scripts/get-distro.sh)"
 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}"
 PROFILE="${PROFILE:-emqx}"
 FORCE_COMPILE=0
 FORCE_COMPILE=0
 # Do not start using ekka epmd by default, so your IDE can connect to it
 # 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}"
 export EMQX_PLUGINS__INSTALL_DIR="${EMQX_PLUGINS__INSTALL_DIR:-$BASE_DIR/plugins}"
 CONFIGS_DIR="$EMQX_DATA_DIR/configs"
 CONFIGS_DIR="$EMQX_DATA_DIR/configs"
 # Use your cookie so your IDE can connect to it.
 # 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"
 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
 if [ $EKKA_EPMD -eq 1 ]; then
     EPMD_ARGS='-start_epmd false -epmd_module ekka_epmd'
     EPMD_ARGS='-start_epmd false -epmd_module ekka_epmd'