pull/1953/head
skiffer-git 2 years ago
parent c61a79a9f7
commit 8d4734c4e3

@ -81,7 +81,7 @@ else
fi 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) result=$(. $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check)
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "+++ cat openim log file >>> ${LOG_FILE}" echo "+++ cat openim log file >>> ${LOG_FILE}"

@ -503,33 +503,18 @@ openim::util::check_process_names_for_stop() {
fi fi
done 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 if [[ ${#started[@]} -ne 0 ]]; then
echo echo
echo "Started processes:" echo "The programs that have not exited are:"
for info in "${started[@]}"; do for info in "${started[@]}"; do
echo "$info" echo "$info "
done 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 return 1
else
echo ""
openim::log::success "All processes are running."
return 0
fi fi
return 0
} }
# openim::util::check_process_names docker-pr # openim::util::check_process_names docker-pr

Loading…
Cancel
Save