diff --git a/go.sum b/go.sum index 0bba2d65f..230c142c6 100644 --- a/go.sum +++ b/go.sum @@ -16,12 +16,6 @@ cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYE firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/IBM/sarama v1.41.3 h1:MWBEJ12vHC8coMjdEXFq/6ftO6DUZnQlFYcxtOJFa7c= -github.com/IBM/sarama v1.41.3/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ= -github.com/OpenIMSDK/protocol v0.0.53 h1:PtePLTqMYRHjWSf8XIL3x5JRC3YoySTMA6tRKfbUjQY= -github.com/OpenIMSDK/protocol v0.0.53/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= -github.com/OpenIMSDK/tools v0.0.29 h1:NS4PEwYl9sX3SWsMjDOLVxMo3LcTWREMr+2cjzWjcqc= -github.com/OpenIMSDK/tools v0.0.29/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI= github.com/IBM/sarama v1.42.2 h1:VoY4hVIZ+WQJ8G9KNY/SQlWguBQXQ9uvFPOnrcu8hEw= github.com/IBM/sarama v1.42.2/go.mod h1:FLPGUGwYqEs62hq2bVG6Io2+5n+pS6s/WOXVKWSLFtE= github.com/OpenIMSDK/protocol v0.0.55 h1:eBjg8DyuhxGmuCUjpoZjg6MJJJXU/xJ3xJwFhrn34yA= diff --git a/tools/component/component.go b/tools/component/component.go index d3768b692..951de082c 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -31,7 +31,6 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "gopkg.in/yaml.v3" ) @@ -80,7 +79,6 @@ func main() { fmt.Printf("configGetEnv failed, err:%v", err) return } - checks := []checkFunc{ //{name: "Mysql", function: checkMysql}, @@ -95,7 +93,7 @@ func main() { if i != 0 { time.Sleep(1 * time.Second) } - fmt.Printf("Checking components Round %v...\n", i+1) + fmt.Printf("Checking components round %v...\n", i+1) var err error allSuccess := true @@ -103,25 +101,16 @@ func main() { if !check.flag { err = check.function(check.config) if err != nil { - + allSuccess = false + component.ErrorPrint(fmt.Sprintf("Check component: %s, failed: %s", check.name, err.Error())) if check.name == "Minio" { - if errors.Is(err, errMinioNotEnabled) { - fmt.Println(err.Error(), " check ", check.name) - checks[index].flag = true - } - if errors.Is(err, errSignEndPoint) { + if errors.Is(err, errMinioNotEnabled) || + errors.Is(err, errSignEndPoint) || + errors.Is(err, errApiURL) { fmt.Fprintf(os.Stderr, err.Error(), " check ", check.name) checks[index].flag = true + continue } - } - - - 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") || - strings.Contains(errs.Unwrap(err).Error(), "context deadline exceeded") { - component.ErrorPrint(fmt.Sprintf("try check connection %s", check.name)) - allSuccess = false break } } else { @@ -129,14 +118,14 @@ func main() { component.SuccessPrint(fmt.Sprintf("%s connected successfully", check.name)) } } - } + } if allSuccess { component.SuccessPrint("All components started successfully!") return } } - component.ErrorPrint("Some components started failed!") + component.ErrorPrint("Some components checked failed!") os.Exit(-1) } @@ -174,13 +163,13 @@ func checkRedis(config *config.GlobalConfig) error { // checkMinio checks the MinIO connection func checkMinio(config *config.GlobalConfig) error { if strings.Contains(config.Object.ApiURL, "127.0.0.1") { - return errs.Wrap(errApiURL, "config.Object.ApiURL: "+config.Object.ApiURL) + return errs.Wrap(errApiURL) } if config.Object.Enable != "minio" { - return errs.Wrap(errMinioNotEnabled, "config.Object.Enable: "+config.Object.Enable) + return errs.Wrap(errMinioNotEnabled) } if strings.Contains(config.Object.Minio.Endpoint, "127.0.0.1") { - return errs.Wrap(errSignEndPoint, "config.Object.Minio.Endpoint: "+config.Object.Minio.Endpoint) + return errs.Wrap(errSignEndPoint) } minio := &component.Minio{