Zaiming Shi 4 лет назад
Родитель
Сommit
cd92f73ca1
3 измененных файлов с 8 добавлено и 4 удалено
  1. 6 2
      .ci/build_packages/tests.sh
  2. 1 1
      .tool-versions
  3. 1 1
      bin/emqx

+ 6 - 2
.ci/build_packages/tests.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 set -x -e -u
+export DEBUG=1
 export CODE_PATH=${CODE_PATH:-"/emqx"}
 export EMQX_NAME=${EMQX_NAME:-"emqx"}
 export PACKAGE_PATH="${CODE_PATH}/_packages/${EMQX_NAME}"
 export RELUP_PACKAGE_PATH="${CODE_PATH}/_upgrade_base"
-# export EMQX_NODE_NAME="emqx-on-$(uname -m)@127.0.0.1"
-# export EMQX_NODE_COOKIE=$(date +%s%N)
 
 case "$(uname -m)" in
     x86_64)
@@ -122,6 +121,9 @@ run_test(){
         tee -a "$emqx_env_vars" <<EOF
 export EMQX_ZONE__EXTERNAL__SERVER_KEEPALIVE=60
 export EMQX_MQTT__MAX_TOPIC_ALIAS=10
+export EMQX_LOG__CONSOLE_HANDLER__LEVEL=debug
+export EMQX_LOG__FILE_HANDLERS__EMQX_LOG__LEVEL=debug
+export EMQX_LOG__PRIMARY_LEVEL=debug
 EOF
         ## for ARM, due to CI env issue, skip start of quic listener for the moment
         [[ $(arch) == *arm* || $(arch) == aarch64 ]] && tee -a "$emqx_env_vars" <<EOF
@@ -151,6 +153,8 @@ EOF
     # shellcheck disable=SC2009 # pgrep does not support Extended Regular Expressions
     ps -ef | grep -E '\-progname\s.+emqx\s'
     if ! emqx 'stop'; then
+        # shellcheck disable=SC2009 # pgrep does not support Extended Regular Expressions
+        ps -ef | grep -E '\-progname\s.+emqx\s'
         echo "ERROR: failed_to_stop_emqx_with_the_stop_command"
         cat /var/log/emqx/erlang.log.1 || true
         cat /var/log/emqx/emqx.log.1 || true

+ 1 - 1
.tool-versions

@@ -1 +1 @@
-erlang 24.0.1-emqx-1
+erlang 24.0.5-emqx-1

+ 1 - 1
bin/emqx

@@ -489,7 +489,7 @@ case "$1" in
             # also log to syslog
             logger -t "${REL_NAME}[${PID}]" "STOP: $msg"
             # log to user console
-            echoerr "STOP: $msg"
+            echoerr "stop failed, $msg"
             exit 1
         fi
         logger -t "${REL_NAME}[${PID}]" "STOP: OK"