From 6c22ccd5454f0a96e0f008df01ab88e57a97e332 Mon Sep 17 00:00:00 2001
From: luhaoling <2198702716@qq.com>
Date: Thu, 22 Feb 2024 11:30:26 +0800
Subject: [PATCH] fix: add kill by name in script

---
 scripts/install/openim-api.sh        | 10 +++++++---
 scripts/install/openim-msggateway.sh |  2 --
 scripts/install/openim-rpc.sh        | 15 ++++++++++-----
 scripts/lib/util.sh                  |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/scripts/install/openim-api.sh b/scripts/install/openim-api.sh
index 70d5b31fa..a0fc82437 100755
--- a/scripts/install/openim-api.sh
+++ b/scripts/install/openim-api.sh
@@ -45,6 +45,11 @@ function openim::api::start() {
   echo "++ OPENIM_API_PORT_LISTARIES: ${OPENIM_API_PORT_LISTARIES[@]}"
   echo "++ OpenIM API config path: ${OPENIM_API_CONFIG}"
 
+  readonly OPENIM_API_SERVER_LIBRARIES=("${OPENIM_OUTPUT_HOSTBIN}/${SERVER_NAME}")
+  openim::util::stop_services_with_name ${OPENIM_API_SERVER_LIBRARIES}
+  readonly OPENIM_API_SERVER_LIBRARIES
+  openim::util::stop_services_with_name ${OPENIM_RPC_SERVICE_LISTARIES[@]}
+
   openim::log::info "Starting ${SERVER_NAME} ..."
 
   printf "+------------------------+--------------+\n"
@@ -52,13 +57,12 @@ function openim::api::start() {
   printf "+------------------------+--------------+\n"
   
   local length=${#OPENIM_API_SERVICE_LISTARIES[@]}
-  
   for ((i=0; i<length; i++)); do
     printf "| %-22s | %6s       |\n" "${OPENIM_API_SERVICE_LISTARIES[$i]}" "${OPENIM_API_PORT_LISTARIES[$i]}"
     printf "+------------------------+--------------+\n"
     # Stop services on the specified ports before starting new ones
-    openim::util::stop_services_on_ports "${OPENIM_API_PORT_LISTARIES[$i]}"
-    openim::util::stop_services_on_ports "${OPENIM_API_PROMETHEUS_PORT_LISTARIES[$i]}"
+#    openim::util::stop_services_on_ports "${OPENIM_API_PORT_LISTARIES[$i]}"
+#    openim::util::stop_services_on_ports "${OPENIM_API_PROMETHEUS_PORT_LISTARIES[$i]}"
     openim::log::info "OpenIM ${OPENIM_API_SERVICE_LISTARIES[$i]} config path: ${OPENIM_API_CONFIG}"
     
     # Start the service with Prometheus port if specified
diff --git a/scripts/install/openim-msggateway.sh b/scripts/install/openim-msggateway.sh
index a2316c784..db2b77bd3 100755
--- a/scripts/install/openim-msggateway.sh
+++ b/scripts/install/openim-msggateway.sh
@@ -21,8 +21,6 @@ set -o pipefail
 OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P)
 [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh
 
-openim::util::set_max_fd 200000
-
 SERVER_NAME="openim-msggateway"
 
 function openim::msggateway::start() {
diff --git a/scripts/install/openim-rpc.sh b/scripts/install/openim-rpc.sh
index f8feaaa57..41b68a615 100755
--- a/scripts/install/openim-rpc.sh
+++ b/scripts/install/openim-rpc.sh
@@ -30,10 +30,10 @@
 # Usage:
 # 1. Direct Script Execution:
 #    This initiates all the RPC services declared under the function openim::rpc::service_name.
-#    Example: ./openim-rpc-{rpc-name}.sh  openim::rpc::start
+#    Example: ./openim-rpc.sh  openim::rpc::start
 # 2. Controlling through Functions for systemctl operations:
 #    Specific operations like installation, uninstallation, and status check can be executed by passing the respective function name as an argument to the script.
-#    Example: ./openim-rpc-{rpc-name}.sh openim::rpc::install
+#    Example: ./openim-rpc.sh openim::rpc::install
 #
 # Note: Before executing this script, ensure that the necessary permissions are granted and relevant environmental variables are set.
 #
@@ -64,6 +64,12 @@ IFS=" " read -ra OPENIM_RPC_SERVICE_TARGETS <<< "$(openim::rpc::service_name)"
 readonly OPENIM_RPC_SERVICE_TARGETS
 readonly OPENIM_RPC_SERVICE_LISTARIES=("${OPENIM_RPC_SERVICE_TARGETS[@]##*/}")
 
+OPENIM_RPC_SERVICE_LIBRARIES=()
+for target in "${OPENIM_RPC_SERVICE_TARGETS[@]}"; do
+  OPENIM_RPC_SERVICE_LIBRARIES+=("${OPENIM_OUTPUT_HOSTBIN}/${target}")
+done
+readonly OPENIM_RPC_SERVICE_LIBRARIES
+
 # Make sure the environment is only called via common to avoid too much nesting
 openim::rpc::service_port() {
   local targets=(
@@ -121,11 +127,10 @@ function openim::rpc::start() {
     printf "+------------------------+-------+-----------------+\n"
     done
 
+    openim::util::stop_services_with_name ${OPENIM_RPC_SERVICE_LIBRARIES[@]}
+
     # start all rpc services
     for ((i = 0; i < ${#OPENIM_RPC_SERVICE_LISTARIES[*]}; i++)); do
-        # openim::util::stop_services_with_name ${OPENIM_RPC_SERVICE_LISTARIES
-        openim::util::stop_services_on_ports ${OPENIM_RPC_PORT_LISTARIES[$i]}
-        openim::util::stop_services_on_ports ${OPENIM_RPC_PROM_PORT_LISTARIES[$i]}
 
         openim::log::info "OpenIM ${OPENIM_RPC_SERVICE_LISTARIES[$i]} config path: ${OPENIM_RPC_CONFIG}"
 
diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh
index 68c29bab4..ad581ea3a 100755
--- a/scripts/lib/util.sh
+++ b/scripts/lib/util.sh
@@ -664,7 +664,7 @@ openim::util::stop_services_with_name() {
             if [[ -n $pid ]]; then
                 # Try to stop the service by killing its process.
                 if kill -15 $pid 2>/dev/null; then
-                    stopped_this_time=true
+                    stopped_this_time=true   jk
                 fi
             fi
         done