Optimizing Docker Log Output (openimsdk#2018)

* Optimize script logs * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection * Optimizing Docker Log Output Detection
deterclosed · Mar 7, 2024 · 39647b3 · 39647b3
1 parent 38f685b
commit 39647b3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/scripts/check-all.sh b/scripts/check-all.sh
@@ -26,8 +26,8 @@
 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
+if openim::util::is_running_in_container; then
+  exec >> ${DOCKER_LOG_FILE} 2>&1
 fi
 
 
@@ -75,7 +75,7 @@ if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then
   openim::color::echo ${COLOR_CYAN} "Environment in the interior of the container"
 else
   openim::color::echo ${COLOR_CYAN} "The environment is outside the container"
-  openim::util::check_ports ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]} || return 0
+  openim::util::check_ports ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]}
 fi
 
 if [[ $? -ne 0 ]]; then

diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh
@@ -28,7 +28,7 @@ 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.log"
 if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then
   mkdir -p "${OPENIM_OUTPUT}/logs"
   touch "$LOG_FILE"

diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh
@@ -2866,6 +2866,15 @@ function openim::util::gen_os_arch() {
 
 
 
+function openim::util::is_running_in_container() {
+  if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+
 function openim::util::check_process_names_for_stop() {
   local all_stopped=true
   for service in "${OPENIM_ALL_SERVICE_LIBRARIES[@]}"; do

diff --git a/scripts/start-all.sh b/scripts/start-all.sh
@@ -62,7 +62,7 @@ function execute_start_scripts() {
 
 
 
-if grep -q docker /proc/1/cgroup; then
+if openim::util::is_running_in_container; then
   exec > ${DOCKER_LOG_FILE} 2>&1
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ function execute_start_scripts() { @@
-    if grep -q docker /proc/1/cgroup; then
+    if openim::util::is_running_in_container; then
       exec > ${DOCKER_LOG_FILE} 2>&1
     fi
@@ Expand Down @@