Sfoglia il codice sorgente

chore: fix logging in bin/emqx on non-tty

Ivan Dyachkov 3 anni fa
parent
commit
4a9be95f6d
1 ha cambiato i file con 10 aggiunte e 2 eliminazioni
  1. 10 2
      bin/emqx

+ 10 - 2
bin/emqx

@@ -54,11 +54,19 @@ export ERTS_LIB_DIR="$RUNNER_ROOT_DIR/lib"
 DYNLIBS_DIR="$RUNNER_ROOT_DIR/dynlibs"
 DYNLIBS_DIR="$RUNNER_ROOT_DIR/dynlibs"
 
 
 logerr() {
 logerr() {
-    echo -e "$(tput setaf 1)ERROR: $*$(tput sgr0)" 1>&2
+    if [ "${TERM:-dumb}" = dumb ]; then
+        echo -e "ERROR: $*" 1>&2
+    else
+        echo -e "$(tput setaf 1)ERROR: $*$(tput sgr0)" 1>&2
+    fi
 }
 }
 
 
 logwarn() {
 logwarn() {
-    echo "$(tput setaf 3)WARNING: $*$(tput sgr0)"
+    if [ "${TERM:-dumb}" = dumb ]; then
+        echo "WARNING: $*"
+    else
+        echo "$(tput setaf 3)WARNING: $*$(tput sgr0)"
+    fi
 }
 }
 
 
 die() {
 die() {