From 8d4734c4e38ca81dc413d4cefb807dd9137f1acd Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 22 Feb 2024 21:18:34 +0800 Subject: [PATCH] log --- scripts/check-all.sh | 2 +- scripts/lib/util.sh | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/scripts/check-all.sh b/scripts/check-all.sh index 3fe0866c8..da3297860 100755 --- a/scripts/check-all.sh +++ b/scripts/check-all.sh @@ -81,7 +81,7 @@ else fi -openim::log::info "\n## Check OpenIM service name ${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer" +openim::log::info "\n## Check OpenIM service name: ${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer" result=$(. $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check) if [[ $? -ne 0 ]]; then echo "+++ cat openim log file >>> ${LOG_FILE}" diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh index 271606c41..10825eab9 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -503,33 +503,18 @@ openim::util::check_process_names_for_stop() { fi done - # Print information - if [[ ${#not_started[@]} -ne 0 ]]; then - echo "Not started processes:" - for process_name in "${not_started[@]}"; do - openim::log::error "Process $process_name is not started." - done - fi if [[ ${#started[@]} -ne 0 ]]; then echo - echo "Started processes:" + echo "The programs that have not exited are:" for info in "${started[@]}"; do - echo "$info" + echo "$info " done - fi - - # Return status - if [[ ${#not_started[@]} -ne 0 ]]; then - openim::color::echo $COLOR_RED " OpenIM Stdout Log >> cat ${LOG_FILE}" - openim::color::echo $COLOR_RED " OpenIM Stderr Log >> cat ${STDERR_LOG_FILE}" - cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}' return 1 - else - echo "" - openim::log::success "All processes are running." - return 0 fi + + return 0 + } # openim::util::check_process_names docker-pr