From d09eccd117c722da27e6e51f4dca37d77650c8cd Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Thu, 7 Mar 2024 10:54:47 +0800
Subject: [PATCH] Optimize script logs

---
 scripts/check-all.sh        | 5 +++++
 scripts/docker-start-all.sh | 6 +-----
 scripts/lib/logging.sh      | 2 ++
 scripts/start-all.sh        | 8 ++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/scripts/check-all.sh b/scripts/check-all.sh
index a9b07d65b..1d05f838b 100755
--- a/scripts/check-all.sh
+++ b/scripts/check-all.sh
@@ -26,6 +26,11 @@
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/install/common.sh"
 
+if grep -q docker /proc/1/cgroup; then
+  exec > ${DOCKER_LOG_FILE} 2>&1
+fi
+
+
 OPENIM_VERBOSE=4
 
 openim::log::info "\n# Begin to check all openim service"
diff --git a/scripts/docker-start-all.sh b/scripts/docker-start-all.sh
index c47069e3b..dda6b330b 100755
--- a/scripts/docker-start-all.sh
+++ b/scripts/docker-start-all.sh
@@ -30,8 +30,4 @@ trap 'openim::util::onCtrlC' INT
 
 "${OPENIM_ROOT}"/scripts/start-all.sh
 
-sleep 5
-
-"${OPENIM_ROOT}"/scripts/check-all.sh
-
-tail -f ${LOG_FILE}
+tail -f ${DOCKER_LOG_FILE}
diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh
index 8d017b077..d2bb5bfa8 100755
--- a/scripts/lib/logging.sh
+++ b/scripts/lib/logging.sh
@@ -28,12 +28,14 @@ fi
 LOG_FILE="${OPENIM_OUTPUT}/logs/openim-$(date '+%Y%m%d').log"
 STDERR_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-error-$(date '+%Y%m%d').log"
 TMP_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-tmp-$(date '+%Y%m%d').log"
+DOCKER_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-docker-$(date '+%Y%m%d').log"
 
 if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then
   mkdir -p "${OPENIM_OUTPUT}/logs"
   touch "$LOG_FILE"
   touch "$STDERR_LOG_FILE"
   touch "$TMP_LOG_FILE"
+  touch "$DOCKER_LOG_FILE"
 fi
 
 # Define the logging function
diff --git a/scripts/start-all.sh b/scripts/start-all.sh
index c27f2010c..fcf9496cc 100755
--- a/scripts/start-all.sh
+++ b/scripts/start-all.sh
@@ -17,12 +17,17 @@
 #FIXME The full names of the shell scripts that need to be started are placed in the `need_to_start_server_shell` array.
 
 
+#!/bin/bash
+
+
+
 
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/install/common.sh"
 
 
+
 # Function to execute the scripts.
 function execute_start_scripts() {
   for script_path in "${OPENIM_SERVER_SCRIPT_START_LIST[@]}"; do
@@ -57,6 +62,9 @@ function execute_start_scripts() {
 
 
 
+if grep -q docker /proc/1/cgroup; then
+  exec > ${DOCKER_LOG_FILE} 2>&1
+fi