diff --git a/scripts/check-all-by-signal.sh b/scripts/check-all-by-signal.sh index 8bb5c6b0d..06572ef20 100644 --- a/scripts/check-all-by-signal.sh +++ b/scripts/check-all-by-signal.sh @@ -32,7 +32,6 @@ openim::log::info "\n# Begin to check all openim service" handle_error() { echo "An error occurred. Printing ${STDERR_LOG_FILE} contents:" - cat "${STDERR_LOG_FILE}" exit 1 } diff --git a/scripts/install/openim-msgtransfer.sh b/scripts/install/openim-msgtransfer.sh index 00849211c..d9e112659 100755 --- a/scripts/install/openim-msgtransfer.sh +++ b/scripts/install/openim-msgtransfer.sh @@ -95,9 +95,10 @@ function openim::msgtransfer::check_by_signal() { openim::log::error "Found $NUM_PROCESSES processes for $OPENIM_OUTPUT_HOSTBIN/openim-msgtransfer" for PID in $PIDS; do if [[ "$OSTYPE" == "linux-gnu"* ]]; then - openim::log::error ps -p $PID -o pid,cmd + openim::log::error "$(ps -p $PID -o pid=,cmd= | awk '{print "PID: " $1 ", CMD: " $2}')" elif [[ "$OSTYPE" == "darwin"* ]]; then - openim::log::error ps -p $PID -o pid,comm + # 优化后的命令 + openim::log::error "$(ps -p $PID -o pid=,cmd= | awk '{print "PID: " $1 ", CMD: " $2}')" else openim::log::error "Unsupported OS type: $OSTYPE" fi diff --git a/scripts/stop-all.sh b/scripts/stop-all.sh index e9d838d64..2371ae650 100755 --- a/scripts/stop-all.sh +++ b/scripts/stop-all.sh @@ -34,6 +34,4 @@ openim::util::stop_services_by_signal ${OPENIM_SERVER_PORT_LISTARIES[@]} openim::util::stop_services_by_name_signal "${OPENIM_OUTPUT_HOSTBIN}" -echo "++ Check if the services have been stopped" - openim::log::success "✨ All processes to be killed" \ No newline at end of file