fix: fix the out format

pull/1933/head
luhaoling 2 years ago
parent ee30529e88
commit 132f3b882a

@ -43,10 +43,10 @@ trap handle_error ERR
# Assuming openim::util::check_ports_by_signal function sets a proper exit status # Assuming openim::util::check_ports_by_signal function sets a proper exit status
# based on whether services are running or not. # based on whether services are running or not.
if openim::util::check_ports_by_signal ${OPENIM_SERVER_PORT_LISTARIES[@]}; then if openim::util::check_ports_by_signal ${OPENIM_SERVER_PORT_LISTARIES[@]}; then
echo "++++ All openim service ports stop successfully !"
else
echo "+++ cat openim log file >>> ${LOG_FILE}" echo "+++ cat openim log file >>> ${LOG_FILE}"
openim::log::error_exit "The service does not stop properly, there are still processes running, please check!" openim::log::error_exit "The service does not stop properly, there are still processes running, please check!"
else
echo "++++ All openim service ports stop successfully !"
fi fi
set -e set -e

@ -440,13 +440,13 @@ openim::util::check_ports_by_signal() {
# If any of the processes is not running, return a status of 1. # If any of the processes is not running, return a status of 1.
if [[ ${#not_started[@]} -ne 0 ]]; then if [[ ${#not_started[@]} -ne 0 ]]; then
openim::log::success "All specified processes are running."
return 1
else
openim::color::echo $COLOR_RED " OpenIM Stdout Log >> cat ${LOG_FILE}" openim::color::echo $COLOR_RED " OpenIM Stdout Log >> cat ${LOG_FILE}"
openim::color::echo $COLOR_RED " OpenIM Stderr Log >> cat ${STDERR_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"}' cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}'
return 1 openim::log::error "Have processes no stop."
else
# openim::log::success "All specified processes are running."
openim::log::success "Have processes no stop."
return 0 return 0
fi fi
} }

Loading…
Cancel
Save