From 9c143852ccaa51a948bb9312e4f6585912511037 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Wed, 6 Mar 2024 15:05:41 +0800
Subject: [PATCH] Optimize script logs

---
 scripts/install/openim-crontask.sh    | 5 +++--
 scripts/install/openim-msggateway.sh  | 4 +++-
 scripts/install/openim-msgtransfer.sh | 5 +++--
 scripts/install/openim-push.sh        | 4 +++-
 scripts/install/openim-rpc.sh         | 3 ++-
 scripts/lib/logging.sh                | 7 ++++++-
 scripts/start-all.sh                  | 4 ++--
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/scripts/install/openim-crontask.sh b/scripts/install/openim-crontask.sh
index ae78a44dd..b8d57fed1 100755
--- a/scripts/install/openim-crontask.sh
+++ b/scripts/install/openim-crontask.sh
@@ -51,8 +51,9 @@ function openim::crontask::start() {
   openim::log::status "Start OpenIM Cron, path: ${OPENIM_CRONTASK_BINARY}"
 
   openim::log::status "start cron_task process, path: ${OPENIM_CRONTASK_BINARY}"
-
-  nohup ${OPENIM_CRONTASK_BINARY} -c ${OPENIM_PUSH_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
+  #nohup ${OPENIM_CRONTASK_BINARY} -c ${OPENIM_PUSH_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
+  cmd= "${OPENIM_CRONTASK_BINARY} -c ${OPENIM_PUSH_CONFIG}"
+  nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a  "$TMP_LOG_FILE" | while read line; do echo -e "\e[31m${line}\e[0m"; done >&2) >/dev/null &
   return 0
 
 }
diff --git a/scripts/install/openim-msggateway.sh b/scripts/install/openim-msggateway.sh
index 3eb9bb349..25051aa6e 100755
--- a/scripts/install/openim-msggateway.sh
+++ b/scripts/install/openim-msggateway.sh
@@ -61,8 +61,10 @@ function openim::msggateway::start() {
         if [[ -n "${MSG_GATEWAY_PROM_PORTS_ARRAY[$i]}" ]]; then
             PROMETHEUS_PORT_OPTION="--prometheus_port ${MSG_GATEWAY_PROM_PORTS_ARRAY[$i]}"
         fi
+        cmd="${OPENIM_MSGGATEWAY_BINARY} --port ${OPENIM_MSGGATEWAY_PORTS_ARRAY[$i]} --ws_port ${OPENIM_WS_PORTS_ARRAY[$i]} $PROMETHEUS_PORT_OPTION -c ${OPENIM_MSGGATEWAY_CONFIG}"
+        nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a  "$TMP_LOG_FILE" | while read line; do echo -e "\e[31m${line}\e[0m"; done >&2) >/dev/null &
+       # nohup ${OPENIM_MSGGATEWAY_BINARY} --port ${OPENIM_MSGGATEWAY_PORTS_ARRAY[$i]} --ws_port ${OPENIM_WS_PORTS_ARRAY[$i]} $PROMETHEUS_PORT_OPTION -c ${OPENIM_MSGGATEWAY_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
 
-        nohup ${OPENIM_MSGGATEWAY_BINARY} --port ${OPENIM_MSGGATEWAY_PORTS_ARRAY[$i]} --ws_port ${OPENIM_WS_PORTS_ARRAY[$i]} $PROMETHEUS_PORT_OPTION -c ${OPENIM_MSGGATEWAY_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
     done
     return 0
 }
diff --git a/scripts/install/openim-msgtransfer.sh b/scripts/install/openim-msgtransfer.sh
index 9fdf07fe2..23ce79c36 100755
--- a/scripts/install/openim-msgtransfer.sh
+++ b/scripts/install/openim-msgtransfer.sh
@@ -57,10 +57,11 @@ function openim::msgtransfer::start() {
       openim::util::stop_services_on_ports ${PROMETHEUS_MSG_TRANSFER_PORT}
       PROMETHEUS_PORT_OPTION="--prometheus_port ${PROMETHEUS_MSG_TRANSFER_PORT}"
   fi
-  nohup ${OPENIM_MSGTRANSFER_BINARY} ${PROMETHEUS_PORT_OPTION} -c ${OPENIM_MSGTRANSFER_CONFIG} -n ${i} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
+  cmd="${OPENIM_MSGTRANSFER_BINARY} ${PROMETHEUS_PORT_OPTION} -c ${OPENIM_MSGTRANSFER_CONFIG} -n ${i}"
+  nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a  "$TMP_LOG_FILE" | while read line; do echo -e "\e[31m${line}\e[0m"; done >&2) >/dev/null &
+  #nohup ${OPENIM_MSGTRANSFER_BINARY} ${PROMETHEUS_PORT_OPTION} -c ${OPENIM_MSGTRANSFER_CONFIG} -n ${i} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
   done
   return 0
-
 }
 
 function openim::msgtransfer::check() {
diff --git a/scripts/install/openim-push.sh b/scripts/install/openim-push.sh
index 8684f185c..8dea4b1f1 100755
--- a/scripts/install/openim-push.sh
+++ b/scripts/install/openim-push.sh
@@ -71,7 +71,9 @@ function openim::push::start() {
   
   for (( i=0; i<${#OPENIM_PUSH_PORTS_ARRAY[@]}; i++ )); do
     openim::log::info "start push process, port: ${OPENIM_PUSH_PORTS_ARRAY[$i]}, prometheus port: ${PUSH_PROM_PORTS_ARRAY[$i]}"
-    nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
+    cmd="${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]}"
+    nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a  "$TMP_LOG_FILE" | while read line; do echo -e "\e[31m${line}\e[0m"; done >&2) >/dev/null &
+    #nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
   done
   return 0
 
diff --git a/scripts/install/openim-rpc.sh b/scripts/install/openim-rpc.sh
index e7ee430d2..c3ac12449 100755
--- a/scripts/install/openim-rpc.sh
+++ b/scripts/install/openim-rpc.sh
@@ -165,7 +165,8 @@ function openim::rpc::start_service() {
     printf "Specifying prometheus port: %s\n" "${prometheus_port}"
     cmd="${cmd} --prometheus_port ${prometheus_port}"
   fi
-  nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
+  #nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
+  nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a  "$TMP_LOG_FILE" | while read line; do echo -e "\e[31m${line}\e[0m"; done >&2) >/dev/null &
   return 0
 }
 
diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh
index bef3b5961..8d017b077 100755
--- a/scripts/lib/logging.sh
+++ b/scripts/lib/logging.sh
@@ -237,4 +237,9 @@ function openim::log::test_log() {
   openim::log::error_exit "openim::log::error_exit"
 }
 
-# openim::log::test_log
\ No newline at end of file
+# openim::log::test_log
+
+function openim::log::print_blue() {
+    echo -e "\033[0;36m$1\033[0m"
+}
+
diff --git a/scripts/start-all.sh b/scripts/start-all.sh
index 9a98bfca3..6bb41515c 100755
--- a/scripts/start-all.sh
+++ b/scripts/start-all.sh
@@ -69,7 +69,7 @@ fi
 
 "${OPENIM_ROOT}"/scripts/init-config.sh --skip
 
-echo "You need to start the following scripts in order: ${OPENIM_SERVER_SCRIPTARIES[@]}"
+openim::log::print_blue "Execute the following script in sequence: ${OPENIM_SERVER_SCRIPTARIES[@]}"
 
 
 # TODO Prelaunch tools, simple for now, can abstract functions later
@@ -81,7 +81,7 @@ ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start
 
 result=$("${OPENIM_ROOT}"/scripts/stop-all.sh)
 if [[ $? -ne 0 ]]; then
-  echo "+++ cat openim log file >>> ${LOG_FILE}"
+  openim::log::error "View the error logs from this startup. ${LOG_FILE} \n"
   openim::log::error "Some programs have not exited; the start process is aborted .\n $result"
   exit 1
 fi