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

feat: dev script support short names

This commit is contained in:
Stefan Strigler 2023-10-02 15:21:54 +02:00
parent a8740c42cc
commit ad4dac52eb
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dev
View File

@ -46,6 +46,7 @@ OPTIONS:
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 or the \$EMQX_NODE_NAME env. -n|--name: Node name, defaults to \$EMQX_NODE__NAME or the \$EMQX_NODE_NAME env.
-s|--shortnames: Use shortnames for erlang node name (ie. use -sname parameter).
ENVIRONMENT VARIABLES: ENVIRONMENT VARIABLES:
@ -70,6 +71,7 @@ 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
EKKA_EPMD=0 EKKA_EPMD=0
SHORTNAMES=0
COMMAND='run' COMMAND='run'
case "${1:-novalue}" in case "${1:-novalue}" in
novalue) novalue)
@ -117,6 +119,9 @@ while [ "$#" -gt 0 ]; do
-e|--ekka-epmd) -e|--ekka-epmd)
EKKA_EPMD=1 EKKA_EPMD=1
;; ;;
-s|--shortnames)
SHORTNAMES=1
;;
--) --)
shift shift
PASSTHROUGH_ARGS=("$@") PASSTHROUGH_ARGS=("$@")
@ -177,6 +182,12 @@ else
EPMD_ARGS='' EPMD_ARGS=''
fi fi
if [ $SHORTNAMES -eq 1 ]; then
ERL_NAME_ARG='-sname'
else
ERL_NAME_ARG='-name'
fi
## build compile the profile is it's not compiled yet ## build compile the profile is it's not compiled yet
prepare_erl_libs() { prepare_erl_libs() {
@ -301,7 +312,7 @@ append_args_file() {
## ensure a new line at the end ## ensure a new line at the end
echo '' >> "$ARGS_FILE" echo '' >> "$ARGS_FILE"
cat <<EOF >> "$ARGS_FILE" cat <<EOF >> "$ARGS_FILE"
-name $EMQX_NODE_NAME $ERL_NAME_ARG $EMQX_NODE_NAME
-mnesia dir '"$EMQX_DATA_DIR/mnesia/$EMQX_NODE_NAME"' -mnesia dir '"$EMQX_DATA_DIR/mnesia/$EMQX_NODE_NAME"'
-stdlib restricted_shell emqx_restricted_shell -stdlib restricted_shell emqx_restricted_shell
+spp true +spp true
@ -399,7 +410,7 @@ boot() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
env APPS="$APPS" iex \ env APPS="$APPS" iex \
--name "$EMQX_NODE_NAME" \ -$ERL_NAME_ARG "$EMQX_NODE_NAME" \
--erl "$EPMD_ARGS_ELIXIR" \ --erl "$EPMD_ARGS_ELIXIR" \
--erl '-user Elixir.IEx.CLI' \ --erl '-user Elixir.IEx.CLI' \
--erl '-proto_dist ekka' \ --erl '-proto_dist ekka' \
@ -415,7 +426,7 @@ boot() {
" "
# shellcheck disable=SC2086 # shellcheck disable=SC2086
erl -name "$EMQX_NODE_NAME" \ erl $ERL_NAME_ARG "$EMQX_NODE_NAME" \
$EPMD_ARGS \ $EPMD_ARGS \
-proto_dist ekka \ -proto_dist ekka \
-args_file "$ARGS_FILE" \ -args_file "$ARGS_FILE" \
@ -429,14 +440,18 @@ boot() {
gen_tmp_node_name() { gen_tmp_node_name() {
local rnd local rnd
rnd="$(od -t u -N 4 /dev/urandom | head -n1 | awk '{print $2 % 1000}')" rnd="$(od -t u -N 4 /dev/urandom | head -n1 | awk '{print $2 % 1000}')"
if [ $SHORTNAMES -eq 1 ]; then
echo "remsh${rnd}"
else
echo "remsh${rnd}-${EMQX_NODE_NAME}" echo "remsh${rnd}-${EMQX_NODE_NAME}"
fi
} }
remsh() { remsh() {
local tmpnode local tmpnode
tmpnode="$(gen_tmp_node_name)" tmpnode="$(gen_tmp_node_name)"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
erl -name "$tmpnode" \ erl $ERL_NAME_ARG "$tmpnode" \
-hidden \ -hidden \
-setcookie "$COOKIE" \ -setcookie "$COOKIE" \
-remsh "$EMQX_NODE_NAME" \ -remsh "$EMQX_NODE_NAME" \
@ -449,7 +464,7 @@ eval_remsh_erl() {
tmpnode="$(gen_tmp_node_name)" tmpnode="$(gen_tmp_node_name)"
erl_code="$1" erl_code="$1"
# shellcheck disable=SC2086 # need to expand EMQD_ARGS # shellcheck disable=SC2086 # need to expand EMQD_ARGS
erl -name "$tmpnode" -setcookie "$COOKIE" -hidden -noshell $EPMD_ARGS -eval "$erl_code" 2>&1 erl $ERL_NAME_ARG "$tmpnode" -setcookie "$COOKIE" -hidden -noshell $EPMD_ARGS -eval "$erl_code" 2>&1
} }
ctl() { ctl() {