refactor(emqx_ctl): simplify emqx_ctl
This commit is contained in:
Zaiming Shi
parent
a0699ff853
commit
2fd0742d2b
13
bin/emqx
13
bin/emqx
|
|
@ -98,7 +98,7 @@ relx_usage() {
|
||||||
echo " don't make it permanent"
|
echo " don't make it permanent"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Usage: $REL_NAME {start|start_boot <file>|ertspath|foreground|stop|restart|reboot|pid|ping|console|console_clean|console_boot <file>|attach|remote_console|upgrade|downgrade|install|uninstall|versions|escript|rpc|rpcterms|eval|root_dir}"
|
echo "Usage: $REL_NAME {start|start_boot <file>|ertspath|foreground|stop|restart|reboot|pid|ping|console|console_clean|console_boot <file>|attach|remote_console|upgrade|downgrade|install|uninstall|versions|escript|ctl|rpc|rpcterms|eval|root_dir}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
@ -652,6 +652,17 @@ case "$1" in
|
||||||
ertspath)
|
ertspath)
|
||||||
echo "$ERTS_PATH"
|
echo "$ERTS_PATH"
|
||||||
;;
|
;;
|
||||||
|
ctl)
|
||||||
|
# Make sure a node IS running
|
||||||
|
if ! relx_nodetool "ping" > /dev/null; then
|
||||||
|
echo "Node is not running!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
shift
|
||||||
|
|
||||||
|
relx_nodetool rpc emqx_ctl run_command "$@"
|
||||||
|
;;
|
||||||
rpc)
|
rpc)
|
||||||
# Make sure a node IS running
|
# Make sure a node IS running
|
||||||
if ! relx_nodetool "ping" > /dev/null; then
|
if ! relx_nodetool "ping" > /dev/null; then
|
||||||
|
|
|
||||||
83
bin/emqx_ctl
83
bin/emqx_ctl
|
|
@ -2,84 +2,5 @@
|
||||||
# -*- tab-width:4;indent-tabs-mode:nil -*-
|
# -*- tab-width:4;indent-tabs-mode:nil -*-
|
||||||
# ex: ts=4 sw=4 et
|
# ex: ts=4 sw=4 et
|
||||||
|
|
||||||
set -e
|
THIS_DIR="$(cd "$(dirname "$(readlink "$0" || echo "$0")")" || true; pwd -P)"
|
||||||
|
exec "$THIS_DIR/emqx" ctl "$@"
|
||||||
ROOT_DIR="$(cd "$(dirname "$(readlink "$0" || echo "$0")")"/..; pwd -P)"
|
|
||||||
# shellcheck disable=SC1090
|
|
||||||
. "$ROOT_DIR"/releases/emqx_vars
|
|
||||||
|
|
||||||
export ROOTDIR="$RUNNER_ROOT_DIR"
|
|
||||||
export ERTS_DIR="$ROOTDIR/erts-$ERTS_VSN"
|
|
||||||
export BINDIR="$ERTS_DIR/bin"
|
|
||||||
|
|
||||||
export RUNNER_ROOT_DIR
|
|
||||||
export REL_VSN
|
|
||||||
|
|
||||||
# shellcheck disable=SC2012,SC2086
|
|
||||||
LATEST_VM_ARGS="$(ls -t $RUNNER_DATA_DIR/configs/vm.*.args | head -1)"
|
|
||||||
if [ -z "$LATEST_VM_ARGS" ]; then
|
|
||||||
echo "No vm.*.args config file found in $RUNNER_DATA_DIR/configs/"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Echo to stderr on errors
|
|
||||||
echoerr() { echo "$@" 1>&2; }
|
|
||||||
|
|
||||||
if [ -z "$WITH_EPMD" ]; then
|
|
||||||
EPMD_ARG="-start_epmd false -epmd_module ekka_epmd -proto_dist ekka"
|
|
||||||
else
|
|
||||||
EPMD_ARG="-start_epmd true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
call_hocon() {
|
|
||||||
export RUNNER_ROOT_DIR
|
|
||||||
export RUNNER_ETC_DIR
|
|
||||||
"$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" hocon "$@" \
|
|
||||||
|| die "ERROR: call_hocon failed: $*" $?
|
|
||||||
}
|
|
||||||
|
|
||||||
# Support for IPv6 Dist. See: https://github.com/emqtt/emqttd/issues/1460
|
|
||||||
PROTO_DIST="$(call_hocon -s emqx_schema -c "$RUNNER_ETC_DIR"/emqx.conf get cluster.proto_dist | tr -d \")"
|
|
||||||
if [ -z "$PROTO_DIST" ]; then
|
|
||||||
PROTO_DIST_ARG=""
|
|
||||||
else
|
|
||||||
PROTO_DIST_ARG="-proto_dist $PROTO_DIST"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Control a node
|
|
||||||
relx_nodetool() {
|
|
||||||
command="$1"; shift
|
|
||||||
|
|
||||||
ERL_FLAGS="$ERL_FLAGS $EPMD_ARG $PROTO_DIST_ARG" \
|
|
||||||
"$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \
|
|
||||||
-setcookie "$COOKIE" "$command" "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
NAME="${EMQX_NODE_NAME:-}"
|
|
||||||
[ -n "$EMQX_NAME" ] && [ -n "$EMQX_HOST" ] && NAME="${EMQX_NAME}@${EMQX_HOST}"
|
|
||||||
[ -z "$NAME" ] && NAME="$(grep -E '^-s?name' "$LATEST_VM_ARGS" | awk '{print $2}')"
|
|
||||||
if [ -z "$NAME" ]; then
|
|
||||||
echoerr "Failed to read node name from $LATEST_VM_ARGS"
|
|
||||||
echoerr "Ensure the node is running and you have permission to read $LATEST_VM_ARGS"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$NAME" in
|
|
||||||
*@*)
|
|
||||||
NAME_TYPE='-name'
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
NAME_TYPE='-sname'
|
|
||||||
esac
|
|
||||||
|
|
||||||
COOKIE="${EMQX_NODE_COOKIE:-}"
|
|
||||||
[ -z "$COOKIE" ] && COOKIE="$(grep -E '^-setcookie' "$LATEST_VM_ARGS" | awk '{print $2}')"
|
|
||||||
if [ -z "$COOKIE" ]; then
|
|
||||||
echoerr "Please set node.cookie in $RUNNER_ETC_DIR/emqx.conf or override from environment variable EMQX_NODE_COOKIE"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "$ROOTDIR"
|
|
||||||
|
|
||||||
relx_nodetool rpc emqx_ctl run_command "$@"
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue