fix(scripts): Ensure ekka in ERL_LIBS for remote nodes
This commit is contained in:
parent
db92f79713
commit
7bf5bb26e7
1
bin/emqx
1
bin/emqx
|
@ -176,6 +176,7 @@ relx_nodetool() {
|
|||
command="$1"; shift
|
||||
|
||||
ERL_FLAGS="$ERL_FLAGS $EPMD_ARG" \
|
||||
ERL_LIBS="${LIB_EKKA_DIR}:${ERL_LIBS:-}" \
|
||||
"$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \
|
||||
-setcookie "$COOKIE" "$command" "$@"
|
||||
}
|
||||
|
|
|
@ -27,11 +27,11 @@ relx_nodetool() {
|
|||
command="$1"; shift
|
||||
|
||||
ERL_FLAGS="$ERL_FLAGS $EPMD_ARG $PROTO_DIST_ARG" \
|
||||
ERL_LIBS="${LIB_EKKA_DIR}:${ERL_LIBS:-}" \
|
||||
"$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \
|
||||
-setcookie "$COOKIE" "$command" "$@"
|
||||
}
|
||||
|
||||
|
||||
if [ -z "$NAME_ARG" ]; then
|
||||
NODENAME="${EMQX_NODE_NAME:-}"
|
||||
# check if there is a node running, inspect its name
|
||||
|
|
|
@ -14,6 +14,7 @@ RUNNER_ETC_DIR="{{ runner_etc_dir }}"
|
|||
RUNNER_DATA_DIR="{{ runner_data_dir }}"
|
||||
RUNNER_USER="{{ runner_user }}"
|
||||
EMQX_DISCR="{{ emqx_description }}"
|
||||
LIB_EKKA_DIR="${RUNNER_LIB_DIR}/ekka-$(grep ekka "${RUNNER_ROOT_DIR}/releases/RELEASES" | awk -F '\"' '{print $2}')"
|
||||
|
||||
## computed vars
|
||||
REL_NAME="emqx"
|
||||
|
|
Loading…
Reference in New Issue