diff --git a/internal/tools/cron_task.go b/internal/tools/cron_task.go index 7161f55fc..20baeffaf 100644 --- a/internal/tools/cron_task.go +++ b/internal/tools/cron_task.go @@ -25,8 +25,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "os" - "os/signal" - "syscall" "time" "github.com/openimsdk/tools/errs" @@ -50,22 +48,12 @@ func Start(ctx context.Context, config *CronTaskConfig) error { return errs.WrapMsg(err, "failed to register discovery service") } client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials())) - ctx, exitBy := context.WithCancelCause(context.Background()) ctx = mcontext.SetOpUserID(ctx, config.Share.IMAdminUserID[0]) conn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg) if err != nil { return err } cli := msg.NewMsgClient(conn) - go func() { - sigs := make(chan os.Signal, 1) - signal.Notify(sigs, syscall.SIGTERM) - select { - case <-ctx.Done(): - case s := <-sigs: - exitBy(fmt.Errorf("exit signal %s", s)) - } - }() crontab := cron.New() clearFunc := func() { now := time.Now() @@ -84,5 +72,5 @@ func Start(ctx context.Context, config *CronTaskConfig) error { log.ZInfo(ctx, "start cron task", "chatRecordsClearTime", config.CronTask.ChatRecordsClearTime) crontab.Start() <-ctx.Done() - return context.Cause(ctx) + return nil } diff --git a/tools/check-component/main.go b/tools/check-component/main.go index 25f595694..7fe64d3c5 100644 --- a/tools/check-component/main.go +++ b/tools/check-component/main.go @@ -87,7 +87,6 @@ func initConfig(configDir string) (*config.Mongo, *config.Redis, *config.Kafka, if err != nil { return nil, nil, nil, nil, nil, err } - fmt.Println("thirdConfig", thirdConfig) if thirdConfig.Object.Enable == "minio" { err = config.LoadConfig(filepath.Join(configDir, cmd.MinioConfigFileName), cmd.ConfigEnvPrefixMap[cmd.MinioConfigFileName], minioConfig) @@ -96,8 +95,6 @@ func initConfig(configDir string) (*config.Mongo, *config.Redis, *config.Kafka, } } else { minioConfig = nil - fmt.Println("minioConfig = nil") - } err = config.LoadConfig(filepath.Join(configDir, cmd.ZookeeperConfigFileName), cmd.ConfigEnvPrefixMap[cmd.ZookeeperConfigFileName], zookeeperConfig) if err != nil {