From b9088f0b4753ece253817161eae465f626f58c15 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Fri, 8 Mar 2024 10:17:36 +0800
Subject: [PATCH] Exit with code 1 when the check script fails

---
 scripts/install/openim-tools.sh | 25 ++++++++++++++++++++-----
 scripts/start-all.sh            |  9 ++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/scripts/install/openim-tools.sh b/scripts/install/openim-tools.sh
index 4eb722c6e..71368631e 100755
--- a/scripts/install/openim-tools.sh
+++ b/scripts/install/openim-tools.sh
@@ -102,6 +102,17 @@ function openim::tools::start_service() {
   fi
   openim::log::status "Starting binary ${binary_name}..."
   ${cmd} | tee -a "${LOG_FILE}"
+  ehco "11111111111111file: " ${LOG_FILE} $TMP_LOG_FILE
+  ${cmd} >> "${LOG_FILE}" 2>&1
+    local status=$?
+
+    if [ $status -eq 0 ]; then
+        openim::log::info "Service ${binary_name} started successfully."
+        return 0
+    else
+        openim::log::error "Failed to start service ${binary_name}."
+        return 1
+    fi
 }
 
 function openim::tools::start() {
@@ -115,11 +126,15 @@ function openim::tools::start() {
 
 
 function openim::tools::pre-start() {
-    openim::log::info "Preparing to start OpenIM Tools..."
-    for tool in "${OPENIM_TOOLS_PRE_START_NAME_LISTARIES[@]}"; do
-        openim::log::info "Starting tool ${tool}..."
-        openim::tools::start_service ${tool} ${OPNEIM_CONFIG}
-    done
+   openim::log::info "Preparing to start OpenIM Tools..."
+      for tool in "${OPENIM_TOOLS_PRE_START_NAME_LISTARIES[@]}"; do
+          openim::log::info "Starting tool ${tool}..."
+          if ! openim::tools::start_service ${tool} ${OPNEIM_CONFIG}; then
+              openim::log::error "Failed to start ${tool}, aborting..."
+              return 1
+          fi
+      done
+      openim::log::info "All tools started successfully."
 }
 
 function openim::tools::post-start() {
diff --git a/scripts/start-all.sh b/scripts/start-all.sh
index 419c16628..ff2ae20c8 100755
--- a/scripts/start-all.sh
+++ b/scripts/start-all.sh
@@ -84,7 +84,14 @@ fi
 TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh
 
 openim::log::status "\n## Pre Starting OpenIM services"
-${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start
+
+
+
+if ! ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start; then
+  openim::log::error "Pre Starting OpenIM services failed, aborting..."
+  exit 1
+fi
+
 
 
 result=$("${OPENIM_ROOT}"/scripts/stop-all.sh)