From 42ad29bfdf2aa165828cf64d24ca276d9e866c00 Mon Sep 17 00:00:00 2001
From: luhaoling <2198702716@qq.com>
Date: Mon, 19 Feb 2024 18:32:14 +0800
Subject: [PATCH] fix: fix the msgtranfer script

---
 scripts/check-all-by-signal.sh        |  6 +++---
 scripts/install/openim-msgtransfer.sh | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/scripts/check-all-by-signal.sh b/scripts/check-all-by-signal.sh
index f953c08e2..efd860a5e 100644
--- a/scripts/check-all-by-signal.sh
+++ b/scripts/check-all-by-signal.sh
@@ -70,15 +70,15 @@ else
 fi
 
 openim::log::info "\n## Check OpenIM service name"
-. $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check
+. $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check_by_signal
 
 openim::log::info "\n## Check all OpenIM service ports"
 echo "+++ The port being checked: ${OPENIM_SERVER_PORT_LISTARIES[@]}"
 openim::util::check_ports_by_signal ${OPENIM_SERVER_PORT_LISTARIES[@]}
 if [[ $? -eq 0 ]]; then
-  openim::log::error_exit "The service does not stop properly, there are still processes running, please check the port, query variable definition!"
-else
   echo "+++ cat openim log file >>> ${LOG_FILE}"
+  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
 
diff --git a/scripts/install/openim-msgtransfer.sh b/scripts/install/openim-msgtransfer.sh
index 783e06729..09f054da5 100755
--- a/scripts/install/openim-msgtransfer.sh
+++ b/scripts/install/openim-msgtransfer.sh
@@ -88,6 +88,27 @@ function openim::msgtransfer::check() {
   fi
 }
 
+function openim::msgtransfer::check_by_signal() {
+  PIDS=$(pgrep -f "${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer")
+  NUM_PROCESSES=$(echo "$PIDS" | wc -l | xargs)
+
+  if [ "$NUM_PROCESSES" -gt 0 ]; then
+    openim::log::info "Found $NUM_PROCESSES processes for $OPENIM_OUTPUT_HOSTBIN/openim-msgtransfer"
+    for PID in $PIDS; do
+      if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        ps -p $PID -o pid,cmd
+      elif [[ "$OSTYPE" == "darwin"* ]]; then
+        ps -p $PID -o pid,comm
+      else
+        openim::log::error "Unsupported OS type: $OSTYPE"
+      fi
+    done
+    openim::log::error "Processes have not been stopped properly."
+  else
+    openim::log::success "All openim-msgtransfer processes have been stopped properly."
+  fi
+}
+
 ###################################### Linux Systemd ######################################
 SYSTEM_FILE_PATH="/etc/systemd/system/${SERVER_NAME}.service"