fix: reconstruct the script of 'make start' 'make stop' and 'make check' (#1953)

* fix: del the error world * fix: refactoring scripts * fix: del nounset * rm set error * rm set error * replace openim::log::info * replace openim::log::info * replace openim::log::info * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * fix: fix the error output format * log * fix: fix the error * log * log * fix: fi the code error * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * log * fix: use printf replace the echo --------- Co-authored-by: skiffer-git <44203734@qq.com>
2026-05-03 16:45:59 +08:00 · 2024-02-27 17:58:54 +08:00
parent 8e6c1d74c7
commit ac8775827d
43 changed files with 522 additions and 290 deletions
@@ -15,9 +15,9 @@


 # Common utilities, variables and checks for all build scripts.
-set -o errexit
-set +o nounset
-set -o pipefail
+
+
+

 # Sourced flag
 COMMON_SOURCED=true
@@ -99,6 +99,22 @@ IFS=" " read -ra OPENIM_SERVER_PORT_TARGETS <<< "$(openim::common::service_port)
 readonly OPENIM_SERVER_PORT_TARGETS
 readonly OPENIM_SERVER_PORT_LISTARIES=("${OPENIM_SERVER_PORT_TARGETS[@]##*/}")

+
+OPENIM_ALL_SERVICE_LIBRARIES_NO_TRANSFER=()
+
+for target in "${OPENIM_SERVER_BINARIES_NO_TRANSFER[@]}"; do
+  OPENIM_ALL_SERVICE_LIBRARIES_NO_TRANSFER+=("${OPENIM_OUTPUT_HOSTBIN}/${target}")
+done
+readonly OPENIM_ALL_SERVICE_LIBRARIES_NO_TRANSFER
+
+
+
+OPENIM_ALL_SERVICE_LIBRARIES=()
+for target in "${OPENIM_SERVER_BINARIES_NO_CMDUTILS[@]}"; do
+  OPENIM_ALL_SERVICE_LIBRARIES+=("${OPENIM_OUTPUT_HOSTBIN}/${target}")
+done
+readonly OPENIM_ALL_SERVICE_LIBRARIES
+
 openim::common::dependency_name() {
    local targets=(
        redis
@@ -15,9 +15,9 @@

 # This script will install the dependencies required for openim

-set -o errexit
-set +o nounset
-set -o pipefail
+
+
+

 OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P)
 [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh
@@ -109,7 +109,7 @@ function openim::uninstall::uninstall_openim() {
  openim::common::sudo "systemctl stop openim.target"
  openim::common::sudo "systemctl disable openim.target"
  openim::common::sudo "rm -f /etc/systemd/system/openim.target"
-  set -o errexit
+
  openim::log::success "openim uninstall success"
 }

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-set -o errexit
-set +o nounset
-set -o pipefail
+
+
+

 OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P)
 [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh
@@ -47,24 +47,31 @@ function openim::api::start() {

  openim::log::info "Starting ${SERVER_NAME} ..."

+  readonly OPENIM_API_SERVER_LIBRARIES="${OPENIM_OUTPUT_HOSTBIN}/${SERVER_NAME}"
+
+
  printf "+------------------------+--------------+\n"
  printf "| Service Name           | Port         |\n"
  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::log::info "OpenIM ${OPENIM_API_SERVICE_LISTARIES[$i]} config path: ${OPENIM_API_CONFIG}"
    
    # Start the service with Prometheus port if specified
-    openim::api::start_service "${OPENIM_API_SERVICE_LISTARIES[$i]}" "${OPENIM_API_PORT_LISTARIES[$i]}" "${OPENIM_API_PROMETHEUS_PORT_LISTARIES[$i]}"
-    sleep 2
+    result=$(openim::api::start_service "${OPENIM_API_SERVICE_LISTARIES[$i]}" "${OPENIM_API_PORT_LISTARIES[$i]}" "${OPENIM_API_PROMETHEUS_PORT_LISTARIES[$i]}")
+    if [[ $? -ne 0 ]]; then
+      openim::log::error "stop ${SERVER_NAME} failed"
+    else
+      openim::log::info "$result"
+    fi
+
  done
+  return 0
 }

 function openim::api::start_service() {
@@ -85,7 +92,9 @@ function openim::api::start_service() {
  
  if [ $? -ne 0 ]; then
    openim::log::error_exit "Failed to start ${binary_name} on port ${service_port}."
+    return 1
  fi
+  return 0
 }

 ###################################### Linux Systemd ######################################
@@ -138,7 +147,7 @@ function openim::api::uninstall() {
  openim::common::sudo "rm -f ${OPENIM_INSTALL_DIR}/${SERVER_NAME}"
  openim::common::sudo "rm -f ${OPENIM_CONFIG_DIR}/${SERVER_NAME}.yaml"
  openim::common::sudo "rm -f /etc/systemd/system/${SERVER_NAME}.service"
-  set -o errexit
+
  openim::log::info "uninstall ${SERVER_NAME} successfully"
 }

@@ -49,13 +49,11 @@ function openim::crontask::start() {

  openim::log::info "Start OpenIM Cron, binary root: ${SERVER_NAME}"
  openim::log::status "Start OpenIM Cron, path: ${OPENIM_CRONTASK_BINARY}"
-  
-  openim::util::stop_services_with_name ${OPENIM_CRONTASK_BINARY}
-  
+
  openim::log::status "start cron_task process, path: ${OPENIM_CRONTASK_BINARY}"

  nohup ${OPENIM_CRONTASK_BINARY} -c ${OPENIM_PUSH_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
-  openim::util::check_process_names ${SERVER_NAME}
+  return 0

 }

@@ -107,7 +105,7 @@ function openim::crontask::uninstall() {
  openim::common::sudo "rm -f ${OPENIM_INSTALL_DIR}/${SERVER_NAME}"
  openim::common::sudo "rm -f ${OPENIM_CONFIG_DIR}/${SERVER_NAME}.yaml"
  openim::common::sudo "rm -f /etc/systemd/system/${SERVER_NAME}.service"
-  set -o errexit
+
  openim::log::info "uninstall ${SERVER_NAME} successfully"
 }

@@ -76,7 +76,7 @@ function openim::man::uninstall() {
  # Turn off exit-on-error temporarily to handle non-existing files gracefully
  set +o errexit
  openim::common::sudo "rm -f /usr/share/man/man1/openim-*"
-  set -o errexit
+
  
  openim::log::info "Uninstalled openim man pages successfully"
 }
@@ -14,14 +14,13 @@
 # limitations under the License.

 # Common utilities, variables and checks for all build scripts.
-set -o errexit
-set +o nounset
-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"

@@ -31,8 +30,7 @@ function openim::msggateway::start() {

  openim::log::info "Start OpenIM Msggateway, binary root: ${SERVER_NAME}"
  openim::log::status "Start OpenIM Msggateway, path: ${OPENIM_MSGGATEWAY_BINARY}"
-  
-  openim::util::stop_services_with_name ${OPENIM_MSGGATEWAY_BINARY}
+
  
  # OpenIM message gateway service port
  OPENIM_MESSAGE_GATEWAY_PORTS=$(openim::util::list-to-string ${OPENIM_MESSAGE_GATEWAY_PORT} )
@@ -66,8 +64,7 @@ function openim::msggateway::start() {

        nohup ${OPENIM_MSGGATEWAY_BINARY} --port ${OPENIM_MSGGATEWAY_PORTS_ARRAY[$i]} --ws_port ${OPENIM_WS_PORTS_ARRAY[$i]} $PROMETHEUS_PORT_OPTION -c ${OPENIM_MSGGATEWAY_CONFIG} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
    done
-
-    openim::util::check_process_names ${SERVER_NAME}
+    return 0
 }

 ###################################### Linux Systemd ######################################
@@ -117,7 +114,7 @@ function openim::msggateway::uninstall() {
  openim::common::sudo "rm -f ${OPENIM_INSTALL_DIR}/${SERVER_NAME}"
  openim::common::sudo "rm -f ${OPENIM_CONFIG_DIR}/${SERVER_NAME}.yaml"
  openim::common::sudo "rm -f /etc/systemd/system/${SERVER_NAME}.service"
-  set -o errexit
+
  openim::log::info "uninstall ${SERVER_NAME} successfully"
 }

@@ -16,15 +16,13 @@
 # ./scripts/install/openim-msgtransfer.sh openim::msgtransfer::start

 # Common utilities, variables and checks for all build scripts.
-set -o errexit
-set +o nounset
-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-msgtransfer"

 function openim::msgtransfer::start() {
@@ -33,9 +31,7 @@ function openim::msgtransfer::start() {

  openim::log::info "Start OpenIM Msggateway, binary root: ${SERVER_NAME}"
  openim::log::status "Start OpenIM Msggateway, path: ${OPENIM_MSGTRANSFER_BINARY}"
-  
-  openim::util::stop_services_with_name ${OPENIM_MSGTRANSFER_BINARY}
-  
+
  # Message Transfer Prometheus port list
  MSG_TRANSFER_PROM_PORTS=(openim::util::list-to-string ${MSG_TRANSFER_PROM_PORT} )

@@ -46,11 +42,11 @@ function openim::msgtransfer::start() {
  openim::log::info "openim maggateway num: ${OPENIM_MSGGATEWAY_NUM}"
  
  if [ "${OPENIM_MSGGATEWAY_NUM}" -lt 1 ]; then
-    opeim::log::error_exit "OPENIM_MSGGATEWAY_NUM must be greater than 0"
+    opeim::log::error "OPENIM_MSGGATEWAY_NUM must be greater than 0"
  fi
  
  if [ ${OPENIM_MSGGATEWAY_NUM} -ne $((${#MSG_TRANSFER_PROM_PORTS[@]} - 1)) ]; then
-    openim::log::error_exit "OPENIM_MSGGATEWAY_NUM must be equal to the number of MSG_TRANSFER_PROM_PORTS"
+    openim::log::error "OPENIM_MSGGATEWAY_NUM must be equal to the number of MSG_TRANSFER_PROM_PORTS"
  fi
  
  for (( i=0; i<$OPENIM_MSGGATEWAY_NUM; i++ )) do
@@ -63,17 +59,18 @@ function openim::msgtransfer::start() {
  fi
  nohup ${OPENIM_MSGTRANSFER_BINARY} ${PROMETHEUS_PORT_OPTION} -c ${OPENIM_MSGTRANSFER_CONFIG} -n ${i} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
  done
-  
-  openim::util::check_process_names  "${OPENIM_OUTPUT_HOSTBIN}/${SERVER_NAME}"
+  return 0
+
 }

 function openim::msgtransfer::check() {
  PIDS=$(pgrep -f "${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer")
-  
-  NUM_PROCESSES=$(echo "$PIDS" | wc -l)
-  
+  if [ -z "$PIDS" ]; then
+      NUM_PROCESSES=0
+  else
+      NUM_PROCESSES=$(echo "$PIDS" | wc -l)
+  fi
  if [ "$NUM_PROCESSES" -eq "$OPENIM_MSGGATEWAY_NUM" ]; then
-    openim::log::info "Found $OPENIM_MSGGATEWAY_NUM processes named $OPENIM_OUTPUT_HOSTBIN"
    for PID in $PIDS; do
      if [[ "$OSTYPE" == "linux-gnu"* ]]; then
        ps -p $PID -o pid,cmd
@@ -84,10 +81,39 @@ function openim::msgtransfer::check() {
      fi
    done
  else
-    openim::log::error_exit "Expected $OPENIM_MSGGATEWAY_NUM openim msgtransfer processes, but found $NUM_PROCESSES msgtransfer processes."
+    openim::log::error "Expected $OPENIM_MSGGATEWAY_NUM openim msgtransfer processes, but found $NUM_PROCESSES msgtransfer processes."
+    return 1
  fi
+  return 0
 }

+function openim::msgtransfer::check_for_stop() {
+  PIDS=$(pgrep -f "${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer") || PIDS="0"
+  if [  "$PIDS" = "0" ]; then
+      return 0
+  fi
+
+  NUM_PROCESSES=$(echo "$PIDS" | wc -l | xargs)
+
+  if [ "$NUM_PROCESSES" -gt 0 ]; then
+    openim::log::error "Found $NUM_PROCESSES processes for $OPENIM_OUTPUT_HOSTBIN/openim-msgtransfer"
+    for PID in $PIDS; do
+      if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        echo -e "\033[31m$(ps -p $PID -o pid,cmd)\033[0m"
+      elif [[ "$OSTYPE" == "darwin"* ]]; then
+        echo -e "\033[31m$(ps -p $PID -o pid,comm)\033[0m"
+      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
+  return 0
+}
+
+
 ###################################### Linux Systemd ######################################
 SYSTEM_FILE_PATH="/etc/systemd/system/${SERVER_NAME}.service"

@@ -138,7 +164,7 @@ function openim::msgtransfer::uninstall() {
  openim::common::sudo "rm -f ${OPENIM_INSTALL_DIR}/${SERVER_NAME}"
  openim::common::sudo "rm -f ${OPENIM_CONFIG_DIR}/${SERVER_NAME}.yaml"
  openim::common::sudo "rm -f /etc/systemd/system/${SERVER_NAME}.service"
-  set -o errexit
+
  openim::log::info "uninstall ${SERVER_NAME} successfully"
 }

@@ -40,9 +40,9 @@
 #
 # Note: Ensure that the appropriate permissions and environmental variables are set prior to script execution.
 #
-set -o errexit
-set +o nounset
-set -o pipefail
+
+
+

 OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P)
 [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh
@@ -61,22 +61,20 @@ function openim::push::start() {
  
  OPENIM_PUSH_PORTS_ARRAY=$(openim::util::list-to-string ${OPENIM_PUSH_PORT} )
  PUSH_PROM_PORTS_ARRAY=$(openim::util::list-to-string ${PUSH_PROM_PORT} )
-  
-  openim::util::stop_services_with_name ${SERVER_NAME}
-  
+
  openim::log::status "push port list: ${OPENIM_PUSH_PORTS_ARRAY[@]}"
  openim::log::status "prometheus port list: ${PUSH_PROM_PORTS_ARRAY[@]}"
  
  if [ ${#OPENIM_PUSH_PORTS_ARRAY[@]} -ne ${#PUSH_PROM_PORTS_ARRAY[@]} ]; then
-    openim::log::error_exit "The length of the two port lists is different!"
+    openim::log::error "The length of the two port lists is different!"
  fi
  
  for (( i=0; i<${#OPENIM_PUSH_PORTS_ARRAY[@]}; i++ )); do
    openim::log::info "start push process, port: ${OPENIM_PUSH_PORTS_ARRAY[$i]}, prometheus port: ${PUSH_PROM_PORTS_ARRAY[$i]}"
    nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
  done
+  return 0

-  openim::util::check_process_names ${SERVER_NAME}
 }

 ###################################### Linux Systemd ######################################
@@ -125,7 +123,7 @@ function openim::push::uninstall() {
  openim::common::sudo "rm -f ${OPENIM_INSTALL_DIR}/${SERVER_NAME}"
  openim::common::sudo "rm -f ${OPENIM_CONFIG_DIR}/${SERVER_NAME}.yaml"
  openim::common::sudo "rm -f /etc/systemd/system/${SERVER_NAME}.service"
-  set -o errexit
+
  openim::log::info "uninstall ${SERVER_NAME} successfully"
 }

@@ -38,9 +38,9 @@
 # Note: Before executing this script, ensure that the necessary permissions are granted and relevant environmental variables are set.
 #

-set -o errexit
-set +o nounset
-set -o pipefail
+
+
+

 OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P)
 [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh
@@ -64,6 +64,16 @@ 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_ALL_RPC_FULL_PATH=()
+for target in openim::rpc::service_name; do
+  OPENIM_ALL_RPC_FULL_PATH+=("${OPENIM_OUTPUT_HOSTBIN}/${target}")
+done
+readonly OPENIM_ALL_RPC_FULL_PATH
+
+
+
+
 # Make sure the environment is only called via common to avoid too much nesting
 openim::rpc::service_port() {
  local targets=(
@@ -121,14 +131,11 @@ function openim::rpc::start() {
    printf "+------------------------+-------+-----------------+\n"
    done

+
    # 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}"
-
        # Get the service and Prometheus ports.
        OPENIM_RPC_SERVICE_PORTS=( $(openim::util::list-to-string ${OPENIM_RPC_PORT_LISTARIES[$i]}) )
        read -a OPENIM_RPC_SERVICE_PORTS_ARRAY <<< ${OPENIM_RPC_SERVICE_PORTS}
@@ -138,15 +145,17 @@ function openim::rpc::start() {

        for ((j = 0; j < ${#OPENIM_RPC_SERVICE_PORTS_ARRAY[@]}; j++)); do
            openim::log::info "Starting ${OPENIM_RPC_SERVICE_LISTARIES[$i]} service, port: ${OPENIM_RPC_SERVICE_PORTS[j]}, prometheus port: ${OPENIM_RPC_PROM_PORTS[j]}, binary root: ${OPENIM_OUTPUT_HOSTBIN}/${OPENIM_RPC_SERVICE_LISTARIES[$i]}"
-            openim::rpc::start_service "${OPENIM_RPC_SERVICE_LISTARIES[$i]}" "${OPENIM_RPC_SERVICE_PORTS[j]}" "${OPENIM_RPC_PROM_PORTS[j]}"
+            result=$(openim::rpc::start_service "${OPENIM_RPC_SERVICE_LISTARIES[$i]}" "${OPENIM_RPC_SERVICE_PORTS[j]}" "${OPENIM_RPC_PROM_PORTS[j]}")
+            if [[ $? -ne 0 ]]; then
+                openim::log::error "start ${SERVER_NAME} failed"
+            else
+                openim::log::info "$result"
+            fi
        done
    done

-    sleep 5
-
-    openim::util::check_ports ${OPENIM_RPC_PORT_TARGETS[@]}
-    # openim::util::check_ports ${OPENIM_RPC_PROM_PORT_TARGETS[@]}

+    return 0
 }

 function openim::rpc::start_service() {
@@ -161,6 +170,7 @@ function openim::rpc::start_service() {
    cmd="${cmd} --prometheus_port ${prometheus_port}"
  fi
  nohup ${cmd} >> "${LOG_FILE}" 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
+  return 0
 }

 ###################################### Linux Systemd ######################################
@@ -220,7 +230,7 @@ function openim::rpc::uninstall() {
        openim::common::sudo "rm -f ${OPENIM_CONFIG_DIR}/${service}.yaml"
        openim::common::sudo "rm -f ${SYSTEM_FILE_PATHS[$service]}"
    done
-    set -o errexit
+
    openim::log::info "uninstall openim-rpc successfully"
 }

@@ -38,9 +38,9 @@
 #    Example: ./openim-tools.sh openim::tools::install
 #

-set -o errexit
-set +o nounset
-set -o pipefail
+
+
+

 OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P)
 [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh
@@ -122,7 +122,6 @@ function openim::tools::pre-start() {
    for tool in "${OPENIM_TOOLS_PRE_START_NAME_LISTARIES[@]}"; do
        openim::log::info "Starting ${tool}..."
        openim::tools::start_service ${tool} ${OPNEIM_CONFIG}
-        sleep 0.2
    done
 }

@@ -131,7 +130,6 @@ function openim::tools::post-start() {
    for tool in "${OPENIM_TOOLS_POST_START_NAME_LISTARIES[@]}"; do
        openim::log::info "Starting ${tool}..."
        openim::tools::start_service ${tool}
-        sleep 0.2
    done
 }