From eabe4d53da54d01154c872a6016b5087f3dc48e9 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 8 Mar 2024 14:56:44 +0800 Subject: [PATCH 1/6] delete --- scripts/lib/util.sh | 61 --------------------------------------------- 1 file changed, 61 deletions(-) diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh index e9908ae66..f66971252 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -1808,68 +1808,7 @@ openim::util::stop_services_on_ports() { # Usage: # openim::util::stop_services_with_name nginx apache # The function returns a status of 1 if any service couldn't be stopped. -openim::util::stop_services_with_name() { - # An array to collect names of processes that couldn't be stopped. - local not_stopped=() - # An array to collect information about processes that were stopped. - local stopped=() - - echo "Stopping services with names: $*" - # Iterate over each given service name. - for server_name in "$@"; do - # Use the `pgrep` command to find process IDs related to the given service name. - local pids=$(pgrep -f "$server_name") - - # If no process was found with the name, add it to the not_stopped list - if [[ -z $pids ]]; then - not_stopped+=("$server_name") - continue - fi - local stopped_this_time=false - for pid in $pids; do - - # Exclude the PID of the current script - if [[ "$pid" == "$$" ]]; then - continue - fi - - # If there's a Process ID, it means the service with the name is running. - if [[ -n $pid ]]; then - # Try to stop the service by killing its process. - if kill -10 $pid 2>/dev/null; then - stopped_this_time=true - fi - fi - done - - if $stopped_this_time; then - stopped+=("$server_name") - else - not_stopped+=("$server_name") - fi - done - - # Print information about services whose processes couldn't be stopped. - if [[ ${#not_stopped[@]} -ne 0 ]]; then - echo "Services that couldn't be stopped:" - for name in "${not_stopped[@]}"; do - openim::log::status "Failed to stop the $name service." - done - fi - - # Print information about services whose processes were successfully stopped. - if [[ ${#stopped[@]} -ne 0 ]]; then - echo - echo "Stopped services:" - for name in "${stopped[@]}"; do - echo "Successfully stopped the $name service." - done - fi - - openim::log::success "All specified services were stopped." - echo "" -} # sleep 333333& # sleep 444444& # ps -ef | grep "sleep" From a3fff86ed854585c25b473139a16062856ba45a1 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 8 Mar 2024 15:27:26 +0800 Subject: [PATCH 2/6] add context deadline exceeded --- tools/component/component.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/component/component.go b/tools/component/component.go index e3b5b1956..ef7efe487 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -111,10 +111,11 @@ func main() { checks[index].flag = true } component.ErrorPrint(fmt.Sprintf("Starting %s failed:%v.", check.name, errs.Unwrap(err).Error())) - if !strings.Contains(errs.Unwrap(err).Error(), "connection refused") && - !strings.Contains(errs.Unwrap(err).Error(), "timeout waiting") { - component.ErrorPrint("Some components started failed!") - os.Exit(-1) + if strings.Contains(errs.Unwrap(err).Error(), "connection refused") || + strings.Contains(errs.Unwrap(err).Error(), "timeout") || + strings.Contains(errs.Unwrap(err).Error(), "context deadline exceeded") { + component.ErrorPrint("try check connection") + continue } } else { checks[index].flag = true From 210936411dc6c1b5b56890eea895322c66e90d00 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 8 Mar 2024 15:45:03 +0800 Subject: [PATCH 3/6] Error not handled --- tools/component/component.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/component/component.go b/tools/component/component.go index ef7efe487..cb2f306b0 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -259,13 +259,13 @@ func checkKafka(config *config.GlobalConfig) error { _, err = kafka.NewMConsumerGroup(&kafka.MConsumerGroupConfig{ KafkaVersion: sarama.V2_0_0_0, OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false, - }, []string{config.Kafka.MsgToPush.Topic}, + }, []string{config.Kafka.MsgToMongo.Topic}, config.Kafka.Addr, config.Kafka.ConsumerGroupID.MsgToMongo, tlsConfig) if err != nil { return err } - kafka.NewMConsumerGroup(&kafka.MConsumerGroupConfig{ + _, err = kafka.NewMConsumerGroup(&kafka.MConsumerGroupConfig{ KafkaVersion: sarama.V2_0_0_0, OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false, }, []string{config.Kafka.MsgToPush.Topic}, config.Kafka.Addr, From 37947623e3e8fd61af0ea76f16b4cadd18bb8946 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 8 Mar 2024 15:56:54 +0800 Subject: [PATCH 4/6] Error not handled --- tools/component/component.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/component/component.go b/tools/component/component.go index cb2f306b0..33fec7c42 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -102,14 +102,17 @@ func main() { if !check.flag { err = check.function(check.config) if err != nil { - if errors.Is(err, errMinioNotEnabled) { - fmt.Println(err.Error()) - checks[index].flag = true - } - if errors.Is(err, errSignEndPoint) { - fmt.Fprintf(os.Stderr, err.Error()) - checks[index].flag = true + if check.name == "Minio" { + if errors.Is(err, errMinioNotEnabled) { + fmt.Println(err.Error()) + checks[index].flag = true + } + if errors.Is(err, errSignEndPoint) { + fmt.Fprintf(os.Stderr, err.Error()) + checks[index].flag = true + } } + component.ErrorPrint(fmt.Sprintf("Starting %s failed:%v.", check.name, errs.Unwrap(err).Error())) if strings.Contains(errs.Unwrap(err).Error(), "connection refused") || strings.Contains(errs.Unwrap(err).Error(), "timeout") || From 54f13e74ff0b1bb413495946f36075633b03c737 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 8 Mar 2024 15:58:03 +0800 Subject: [PATCH 5/6] Error not handled --- tools/component/component.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/component/component.go b/tools/component/component.go index 33fec7c42..f5f908fa3 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -117,7 +117,7 @@ func main() { if strings.Contains(errs.Unwrap(err).Error(), "connection refused") || strings.Contains(errs.Unwrap(err).Error(), "timeout") || strings.Contains(errs.Unwrap(err).Error(), "context deadline exceeded") { - component.ErrorPrint("try check connection") + component.ErrorPrint(fmt.Sprintf("try check connection %s", check.name)) continue } } else { From caed25252d161108be56a0ea01acef235d3f70e6 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 8 Mar 2024 16:03:59 +0800 Subject: [PATCH 6/6] Error not handled --- tools/component/component.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/component/component.go b/tools/component/component.go index f5f908fa3..c7c135549 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -104,11 +104,11 @@ func main() { if err != nil { if check.name == "Minio" { if errors.Is(err, errMinioNotEnabled) { - fmt.Println(err.Error()) + fmt.Println(err.Error(), " check ", check.name) checks[index].flag = true } if errors.Is(err, errSignEndPoint) { - fmt.Fprintf(os.Stderr, err.Error()) + fmt.Fprintf(os.Stderr, err.Error(), " check ", check.name) checks[index].flag = true } } @@ -118,7 +118,8 @@ func main() { strings.Contains(errs.Unwrap(err).Error(), "timeout") || strings.Contains(errs.Unwrap(err).Error(), "context deadline exceeded") { component.ErrorPrint(fmt.Sprintf("try check connection %s", check.name)) - continue + allSuccess = false + break } } else { checks[index].flag = true