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-09 03:25:59 +08:00 · 2024-02-27 17:58:54 +08:00
parent 8e6c1d74c7
commit ac8775827d
43 changed files with 522 additions and 290 deletions
@@ -19,9 +19,9 @@
 # Encapsulated as: `make check`.
 # READ: https://github.com/openimsdk/open-im-server/tree/main/scripts/install/environment.sh

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

 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/install/common.sh"
@@ -49,13 +49,6 @@ print_services_and_ports() {
  echo "+-------------------------+----------+"
 }

-handle_error() {
-  echo "An error occurred. Printing ${STDERR_LOG_FILE} contents:"
-  cat "${STDERR_LOG_FILE}"
-  exit 1
-}
-
-trap handle_error ERR

 # Assuming OPENIM_SERVER_NAME_TARGETS and OPENIM_SERVER_PORT_TARGETS are defined
 # Similarly for OPENIM_DEPENDENCY_TARGETS and OPENIM_DEPENDENCY_PORT_TARGETS
@@ -71,7 +64,6 @@ echo "++ The port being checked: ${OPENIM_SERVER_PORT_LISTARIES[@]}"
 openim::log::info "\n## Check all dependent service ports"
 echo "++ The port being checked: ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]}"

-set +e

 # Later, after discarding Docker, the Docker keyword is unreliable, and Kubepods is used
 if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then
@@ -85,22 +77,29 @@ if [[ $? -ne 0 ]]; then
  openim::log::error_exit "The service does not start properly, please check the port, query variable definition!"
  echo "+++ https://github.com/openimsdk/open-im-server/tree/main/scripts/install/environment.sh +++"
 else
-  echo "++++ Check all dependent service ports successfully !"
+  openim::log::success "All components depended on by openim are running normally! "
 fi

-openim::log::info "\n## Check OpenIM service name"
-. $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check

-openim::log::info "\n## Check all OpenIM service ports"
-echo "+++ The port being checked: ${OPENIM_SERVER_PORT_LISTARIES[@]}"
-openim::util::check_ports ${OPENIM_SERVER_PORT_LISTARIES[@]}
+openim::log::info "\n## Check openim service name:\n${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer"
+result=$(. $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check)
 if [[ $? -ne 0 ]]; then
  echo "+++ cat openim log file >>> ${LOG_FILE}"
-  openim::log::error_exit "The service does not start properly, please check the port, query variable definition!"
-else
-  echo "++++ Check all openim service ports successfully !"
+  openim::log::error "check process failed.\n $result"
 fi

-set -e

-trap - ERR
+echo "Check openim service name:"
+for item in "${OPENIM_ALL_SERVICE_LIBRARIES_NO_TRANSFER[@]}"; do
+    echo "$item"
+done
+
+result=$(openim::util::check_process_names ${OPENIM_ALL_SERVICE_LIBRARIES_NO_TRANSFER[@]})
+if [[ $? -ne 0 ]]; then
+  echo "+++ cat openim log file >>> ${LOG_FILE}"
+  openim::log::error "check process failed.\n "
+  echo "$result"
+else
+  openim::log::success "All openim services are running normally! "
+fi
+