From 8f01a8de8cb279d1573750a78ce46e031a73ac35 Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Wed, 17 Nov 2021 11:45:48 +0100
Subject: [PATCH] fix: source emqx_vars in node_dump tool

---
 bin/node_dump | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/bin/node_dump b/bin/node_dump
index 859147ac7..c8f76841b 100755
--- a/bin/node_dump
+++ b/bin/node_dump
@@ -1,18 +1,17 @@
 #!/bin/sh
 set -eu
 
-BASE_DIR=$(dirname "$0")
 ROOT_DIR="$(cd "$(dirname "$(readlink "$0" || echo "$0")")"/..; pwd -P)"
-LOG_DIR="$(dirname "$(emqx eval 'hd([ File || #{module := logger_disk_log_h, config := #{file:= File} } <- logger:get_handler_config() ])' | xargs)")"
-
-
 echo "Running node dump in ${ROOT_DIR}"
 
+# shellcheck disable=SC1090
+. "$ROOT_DIR"/releases/emqx_vars
+
 cd "${ROOT_DIR}"
 
-DUMP="$LOG_DIR/node_dump_$(date +"%Y%m%d_%H%M%S").tar.gz"
-CONF_DUMP="$LOG_DIR/conf.dump"
-SYSINFO="$LOG_DIR/sysinfo.txt"
+DUMP="$RUNNER_LOG_DIR/node_dump_$(date +"%Y%m%d_%H%M%S").tar.gz"
+CONF_DUMP="$RUNNER_LOG_DIR/conf.dump"
+SYSINFO="$RUNNER_LOG_DIR/sysinfo.txt"
 
 LOG_MAX_AGE_DAYS=3
 
@@ -47,29 +46,29 @@ done
 
 # Collect system info:
 {
-    collect "$BASE_DIR"/emqx_ctl broker
-    collect "$BASE_DIR"/emqx eval "'emqx_node_dump:sys_info()'"
+    collect "$RUNNER_BIN_DIR"/emqx_ctl broker
+    collect "$RUNNER_BIN_DIR"/emqx eval "'emqx_node_dump:sys_info()'"
 
     collect uname -a
     collect uptime
     collect free
     collect netstat -tnl
 
-    collect "$BASE_DIR"/emqx_ctl plugins list
-    collect "$BASE_DIR"/emqx_ctl modules list
+    collect "$RUNNER_BIN_DIR"/emqx_ctl plugins list
+    collect "$RUNNER_BIN_DIR"/emqx_ctl modules list
 
-    collect "$BASE_DIR"/emqx_ctl vm all
-    collect "$BASE_DIR"/emqx_ctl listeners
+    collect "$RUNNER_BIN_DIR"/emqx_ctl vm all
+    collect "$RUNNER_BIN_DIR"/emqx_ctl listeners
 } > "${SYSINFO}"
 
 # Collect information about the configuration:
 {
-    collect "$BASE_DIR"/emqx eval "'emqx_node_dump:app_env_dump()'"
+    collect "$RUNNER_BIN_DIR"/emqx eval "'emqx_node_dump:app_env_dump()'"
 } > "${CONF_DUMP}"
 
 # Pack files
 {
-    find "$LOG_DIR" -mtime -"${LOG_MAX_AGE_DAYS}" \( -name '*.log.*' -or -name 'run_erl.log*' \)
+    find "$RUNNER_LOG_DIR" -mtime -"${LOG_MAX_AGE_DAYS}" \( -name '*.log.*' -or -name 'run_erl.log*' \)
     echo "${SYSINFO}"
     echo "${CONF_DUMP}"
 } | tar czf "${DUMP}" -T -