From cb88fa2ca3e3d201d7880e7df1e758f652f3c602 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 7 Mar 2024 14:14:16 +0800 Subject: [PATCH] Optimizing Docker Log Output Detection --- scripts/check-all.sh | 4 ++-- scripts/lib/logging.sh | 2 +- scripts/start-all.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/check-all.sh b/scripts/check-all.sh index 1d05f838b..0298b4fc4 100755 --- a/scripts/check-all.sh +++ b/scripts/check-all.sh @@ -26,9 +26,9 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${OPENIM_ROOT}/scripts/install/common.sh" -if grep -q docker /proc/1/cgroup; then +#if grep -q docker /proc/1/cgroup; then exec > ${DOCKER_LOG_FILE} 2>&1 -fi +#fi OPENIM_VERBOSE=4 diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh index 227a2186c..fec71b19d 100755 --- 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-$(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/start-all.sh b/scripts/start-all.sh index fcf9496cc..41d793b30 100755 --- a/scripts/start-all.sh +++ b/scripts/start-all.sh @@ -62,9 +62,9 @@ function execute_start_scripts() { -if grep -q docker /proc/1/cgroup; then +#if grep -q docker /proc/1/cgroup; then exec > ${DOCKER_LOG_FILE} 2>&1 -fi +#fi