Преглед изворни кода

chore: ci print erlang.log.1

Zaiming Shi пре 4 година
родитељ
комит
9e7f34f328
1 измењених фајлова са 22 додато и 5 уклоњено
  1. 22 5
      .ci/build_packages/tests.sh

+ 22 - 5
.ci/build_packages/tests.sh

@@ -42,7 +42,11 @@ emqx_test(){
                 sed -i '/emqx_telemetry/d' "${PACKAGE_PATH}"/emqx/data/loaded_plugins
                 sed -i '/emqx_telemetry/d' "${PACKAGE_PATH}"/emqx/data/loaded_plugins
 
 
                 echo "running ${packagename} start"
                 echo "running ${packagename} start"
-                "${PACKAGE_PATH}"/emqx/bin/emqx start || ( tail "${PACKAGE_PATH}"/emqx/log/emqx.log.1 && exit 1 )
+                if ! "${PACKAGE_PATH}"/emqx/bin/emqx start; then
+                    cat "${PACKAGE_PATH}"/emqx/log/erlang.log.1 || true
+                    cat "${PACKAGE_PATH}"/emqx/log/emqx.log.1 || true
+                    exit 1
+                fi
                 IDLE_TIME=0
                 IDLE_TIME=0
                 while ! curl http://localhost:8081/status >/dev/null 2>&1; do
                 while ! curl http://localhost:8081/status >/dev/null 2>&1; do
                     if [ $IDLE_TIME -gt 10 ]
                     if [ $IDLE_TIME -gt 10 ]
@@ -109,11 +113,15 @@ emqx_test(){
 }
 }
 
 
 running_test(){
 running_test(){
-    export EMQX_ZONE__EXTERNAL__SERVER__KEEPALIVE=60 \
+    export EMQX_ZONE__EXTERNAL__SERVER_KEEPALIVE=60 \
            EMQX_MQTT__MAX_TOPIC_ALIAS=10
            EMQX_MQTT__MAX_TOPIC_ALIAS=10
     sed -i '/emqx_telemetry/d' /var/lib/emqx/loaded_plugins
     sed -i '/emqx_telemetry/d' /var/lib/emqx/loaded_plugins
 
 
-    emqx start || ( tail /var/log/emqx/emqx.log.1 && exit 1 )
+    if ! emqx start; then
+        cat /var/log/emqx/erlang.log.1 || true
+        cat /var/log/emqx/emqx.log.1 || true
+        exit 1
+    fi
     IDLE_TIME=0
     IDLE_TIME=0
    while ! curl http://localhost:8081/status >/dev/null 2>&1; do
    while ! curl http://localhost:8081/status >/dev/null 2>&1; do
         if [ $IDLE_TIME -gt 10 ]
         if [ $IDLE_TIME -gt 10 ]
@@ -130,7 +138,12 @@ running_test(){
 
 
     if [ "$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g' | sed 's/"//g')" = ubuntu ] \
     if [ "$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g' | sed 's/"//g')" = ubuntu ] \
     || [ "$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g' | sed 's/"//g')" = debian ] ;then
     || [ "$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g' | sed 's/"//g')" = debian ] ;then
-        service emqx start || ( tail /var/log/emqx/emqx.log.1 && exit 1 )
+
+        if ! service emqx start; then
+            cat /var/log/emqx/erlang.log.1 || true
+            cat /var/log/emqx/emqx.log.1 || true
+            exit 1
+        fi
         IDLE_TIME=0
         IDLE_TIME=0
         while ! curl http://localhost:8081/status >/dev/null 2>&1; do
         while ! curl http://localhost:8081/status >/dev/null 2>&1; do
             if [ $IDLE_TIME -gt 10 ]
             if [ $IDLE_TIME -gt 10 ]
@@ -154,7 +167,11 @@ relup_test(){
             while read -r pkg; do
             while read -r pkg; do
                 packagename=$(basename "${pkg}")
                 packagename=$(basename "${pkg}")
                 unzip "$packagename"
                 unzip "$packagename"
-                ./emqx/bin/emqx start || ( tail emqx/log/emqx.log.1 && exit 1 )
+                if ! ./emqx/bin/emqx start; then
+                    cat emqx/log/erlang.log.1 || true
+                    cat emqx/log/emqx.log.1 || true
+                    exit 1
+                fi
                 ./emqx/bin/emqx_ctl status
                 ./emqx/bin/emqx_ctl status
                 ./emqx/bin/emqx versions
                 ./emqx/bin/emqx versions
                 cp "${PACKAGE_PATH}/${EMQX_NAME}"-*-"${TARGET_VERSION}-${ARCH}".zip ./emqx/releases
                 cp "${PACKAGE_PATH}/${EMQX_NAME}"-*-"${TARGET_VERSION}-${ARCH}".zip ./emqx/releases