fix: reconstruct the script of 'make start' 'make stop' and 'make che…

…ck' (openimsdk#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 <[email protected]>
withchao · Feb 27, 2024 · ac87758 · ac87758
1 parent 8e6c1d7
commit ac87758
Show file tree

Hide file tree

Showing 43 changed files with 513 additions and 281 deletions.
diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go
@@ -119,7 +119,7 @@ func run(port int, proPort int) error {
 	defer cancel()
 	select {
 	case <-sigs:
-		util.SIGUSR1Exit()
+		util.SIGTERMExit()
 		err := server.Shutdown(ctx)
 		if err != nil {
 			return errs.Wrap(err, "shutdown err")

diff --git a/install.sh b/install.sh
@@ -18,7 +18,7 @@
 #
 
 set -e
-set -o pipefail
+
 
 ############################## OpenIM Github ##############################
 # ... rest of the script ...

diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go
@@ -46,9 +46,7 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
 	netDone := make(chan error)
 	go func() {
 		err = hubServer.Start()
-		if err != nil {
-			netDone <- err
-		}
+		netDone <- err
 	}()
 	return hubServer.LongConnServer.Run(netDone)
 }
diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go
@@ -139,19 +139,17 @@ func (m *MsgTransfer) Start(prometheusPort int) error {
 	signal.Notify(sigs, syscall.SIGTERM)
 	select {
 	case <-sigs:
-		util.SIGUSR1Exit()
+		util.SIGTERMExit()
 		// graceful close kafka client.
 		m.cancel()
 		m.historyCH.historyConsumerGroup.Close()
 		m.historyMongoCH.historyConsumerGroup.Close()
-
+		return nil
 	case <-netDone:
 		m.cancel()
 		m.historyCH.historyConsumerGroup.Close()
 		m.historyMongoCH.historyConsumerGroup.Close()
 		close(netDone)
 		return netErr
 	}
-
-	return nil
 }
diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go
@@ -140,7 +140,7 @@ func Start(
 	signal.Notify(sigs, syscall.SIGTERM)
 	select {
 	case <-sigs:
-		util.SIGUSR1Exit()
+		util.SIGTERMExit()
 		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 		defer cancel()
 		if err := gracefulStopWithCtx(ctx, srv.GracefulStop); err != nil {
@@ -152,7 +152,7 @@ func Start(
 		if err != nil {
 			return errs.Wrap(err, "shutdown err")
 		}
-		return errors.New("SIGTERM EXIT")
+		return nil
 	case <-netDone:
 		close(netDone)
 		return netErr

diff --git a/pkg/util/genutil/genutil.go b/pkg/util/genutil/genutil.go
@@ -15,7 +15,6 @@
 package genutil
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -42,15 +41,12 @@ func OutDir(path string) (string, error) {
 }
 
 func ExitWithError(err error) {
-	if errors.Is(err, errors.New("SIGTERM EXIT")) {
-		os.Exit(-1)
-	}
 	progName := filepath.Base(os.Args[0])
-	fmt.Fprintf(os.Stderr, "\n\n%s exit -1: \n%+v\n\n", progName, err)
+	fmt.Fprintf(os.Stderr, "%s exit -1: %+v\n", progName, err)
 	os.Exit(-1)
 }
 
-func SIGUSR1Exit() {
+func SIGTERMExit() {
 	progName := filepath.Base(os.Args[0])
-	fmt.Printf("\n\n%s receive process terminal SIGTERM exit 0\n\n", progName)
+	fmt.Fprintf(os.Stderr, "Warning %s receive process terminal SIGTERM exit 0\n", progName)
 }
diff --git a/scripts/advertise.sh b/scripts/advertise.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 set -e
-set -o pipefail
+
 
 . $(dirname ${BASH_SOURCE})/lib/init.sh
 

diff --git a/scripts/build-all-service.sh b/scripts/build-all-service.sh
@@ -22,9 +22,9 @@
 # Usage: `scripts/build-all-service.sh`.
 # Example: `scripts/build-go.sh WHAT=cmd/kubelet`.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+
+
+
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/lib/init.sh"

diff --git a/scripts/check-all.sh b/scripts/check-all.sh
@@ -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
+
diff --git a/scripts/cherry-pick.sh b/scripts/cherry-pick.sh
@@ -21,9 +21,9 @@
 # checks them out to a branch named:
 #  automated-cherry-pick-of-<pr>-<target branch>-<timestamp>
 
-set -o errexit
-set -o nounset
-set -o pipefail
+
+
+
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/lib/init.sh"

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -18,9 +18,9 @@
 # shellcheck disable=SC2034 # Variables sourced in other scripts.
 
 # Common utilities, variables and checks for all build scripts.
-set -o errexit
-set +o nounset
-set -o pipefail
+
+
+
 
 # Unset CDPATH, having it set messes up with script import paths
 unset CDPATH

diff --git a/scripts/docker-start-all.sh b/scripts/docker-start-all.sh
@@ -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
+
+
+
 
 #fixme This scripts is the total startup scripts
 #fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array

diff --git a/scripts/gen-swagger-docs.sh b/scripts/gen-swagger-docs.sh
@@ -15,9 +15,9 @@
 
 # Script to generate docs from the latest swagger spec.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+
+
+
 
 # The root of the build/dist directory
 OPENIM_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"

diff --git a/scripts/init-config.sh b/scripts/init-config.sh
@@ -15,9 +15,9 @@
 
 # This script automatically initializes various configuration files and can generate example files.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+
+
+
 
 # Root directory of the OpenIM project
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..

diff --git a/scripts/init-env.sh b/scripts/init-env.sh
@@ -16,8 +16,8 @@
 #FIXME This script is the startup script for multiple servers.
 #FIXME The full names of the shell scripts that need to be started are placed in the `need_to_start_server_shell` array.
 
-set -o nounset
-set -o pipefail
+
+
 
 OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd -P)
 source "${OPENIM_ROOT}/scripts/install/common.sh"

diff --git a/scripts/install-im-server.sh b/scripts/install-im-server.sh
@@ -27,9 +27,9 @@
 # Usage:
 #   SERVER_IMAGE_VERSION=latest IMAGE_REGISTRY=myregistry ./this_script.sh
 
-set -o errexit
-set -o nounset
-set -o pipefail
+
+
+
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/lib/init.sh"

diff --git a/scripts/install/common.sh b/scripts/install/common.sh
@@ -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

diff --git a/scripts/install/dependency.sh b/scripts/install/dependency.sh
@@ -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

diff --git a/scripts/install/install.sh b/scripts/install/install.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"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
     #
     set -e
-    set -o pipefail
     ############################## OpenIM Github ##############################
     # ... rest of the script ...
@@ Expand Down @@