From e941e9118c4bd7a36a9f9143114227bb0298a8c2 Mon Sep 17 00:00:00 2001 From: cncsmonster Date: Mon, 23 Oct 2023 00:09:34 +0800 Subject: [PATCH] fix: fix lint erros in pkg/common/cmd --- pkg/common/cmd/api.go | 9 +-- pkg/common/cmd/cron_task.go | 2 + pkg/common/cmd/msg_gateway.go | 4 ++ pkg/common/cmd/msg_transfer.go | 2 + pkg/common/cmd/msg_utils.go | 27 ++------- pkg/common/cmd/root.go | 105 ++++++++++++++++++++------------- pkg/common/cmd/rpc.go | 9 ++- 7 files changed, 91 insertions(+), 67 deletions(-) diff --git a/pkg/common/cmd/api.go b/pkg/common/cmd/api.go index 7ce872fac..98a200f14 100644 --- a/pkg/common/cmd/api.go +++ b/pkg/common/cmd/api.go @@ -16,9 +16,11 @@ package cmd import ( "fmt" + "github.com/OpenIMSDK/protocol/constant" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/spf13/cobra" + + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type ApiCmd struct { @@ -42,8 +44,7 @@ func (a *ApiCmd) GetPortFromConfig(portType string) int { fmt.Println("GetPortFromConfig:", portType) if portType == constant.FlagPort { return config2.Config.Api.OpenImApiPort[0] - } else { - - return 0 } + + return 0 } diff --git a/pkg/common/cmd/cron_task.go b/pkg/common/cmd/cron_task.go index 1b0e796ac..c1e18e5cf 100644 --- a/pkg/common/cmd/cron_task.go +++ b/pkg/common/cmd/cron_task.go @@ -23,6 +23,7 @@ type CronTaskCmd struct { func NewCronTaskCmd() *CronTaskCmd { ret := &CronTaskCmd{NewRootCmd("cronTask", WithCronTaskLogName())} ret.SetRootCmdPt(ret) + return ret } @@ -34,5 +35,6 @@ func (c *CronTaskCmd) addRunE(f func() error) { func (c *CronTaskCmd) Exec(f func() error) error { c.addRunE(f) + return c.Execute() } diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go index c96bbd7af..c9ecfa42b 100644 --- a/pkg/common/cmd/msg_gateway.go +++ b/pkg/common/cmd/msg_gateway.go @@ -31,6 +31,7 @@ type MsgGatewayCmd struct { func NewMsgGatewayCmd() *MsgGatewayCmd { ret := &MsgGatewayCmd{NewRootCmd("msgGateway")} ret.SetRootCmdPt(ret) + return ret } @@ -43,6 +44,7 @@ func (m *MsgGatewayCmd) getWsPortFlag(cmd *cobra.Command) int { if port == 0 { port = m.PortFromConfig(constant.FlagWsPort) } + return port } @@ -54,8 +56,10 @@ func (m *MsgGatewayCmd) addRunE() { func (m *MsgGatewayCmd) Exec() error { m.addRunE() + return m.Execute() } + func (m *MsgGatewayCmd) GetPortFromConfig(portType string) int { if portType == constant.FlagWsPort { return config2.Config.LongConnSvr.OpenImWsPort[0] diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index 20349ebbb..1e0449b4c 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -27,6 +27,7 @@ type MsgTransferCmd struct { func NewMsgTransferCmd() *MsgTransferCmd { ret := &MsgTransferCmd{NewRootCmd("msgTransfer")} ret.SetRootCmdPt(ret) + return ret } @@ -38,5 +39,6 @@ func (m *MsgTransferCmd) addRunE() { func (m *MsgTransferCmd) Exec() error { m.addRunE() + return m.Execute() } diff --git a/pkg/common/cmd/msg_utils.go b/pkg/common/cmd/msg_utils.go index cfaf631ec..82306da8c 100644 --- a/pkg/common/cmd/msg_utils.go +++ b/pkg/common/cmd/msg_utils.go @@ -22,7 +22,7 @@ import ( type MsgUtilsCmd struct { cobra.Command - msgTool *tools.MsgTool + // msgTool *tools.MsgTool } func (m *MsgUtilsCmd) AddUserIDFlag() { @@ -31,6 +31,7 @@ func (m *MsgUtilsCmd) AddUserIDFlag() { func (m *MsgUtilsCmd) getUserIDFlag(cmdLines *cobra.Command) string { userID, _ := cmdLines.Flags().GetString("userID") + return userID } @@ -38,26 +39,17 @@ func (m *MsgUtilsCmd) AddFixAllFlag() { m.Command.PersistentFlags().BoolP("fixAll", "f", false, "openIM fix all seqs") } -func (m *MsgUtilsCmd) getFixAllFlag(cmdLines *cobra.Command) bool { - fixAll, _ := cmdLines.Flags().GetBool("fixAll") - return fixAll -} - func (m *MsgUtilsCmd) AddClearAllFlag() { m.Command.PersistentFlags().BoolP("clearAll", "c", false, "openIM clear all seqs") } -func (m *MsgUtilsCmd) getClearAllFlag(cmdLines *cobra.Command) bool { - clearAll, _ := cmdLines.Flags().GetBool("clearAll") - return clearAll -} - func (m *MsgUtilsCmd) AddSuperGroupIDFlag() { m.Command.PersistentFlags().StringP("superGroupID", "g", "", "openIM superGroupID") } func (m *MsgUtilsCmd) getSuperGroupIDFlag(cmdLines *cobra.Command) string { superGroupID, _ := cmdLines.Flags().GetString("superGroupID") + return superGroupID } @@ -65,20 +57,10 @@ func (m *MsgUtilsCmd) AddBeginSeqFlag() { m.Command.PersistentFlags().Int64P("beginSeq", "b", 0, "openIM beginSeq") } -func (m *MsgUtilsCmd) getBeginSeqFlag(cmdLines *cobra.Command) int64 { - beginSeq, _ := cmdLines.Flags().GetInt64("beginSeq") - return beginSeq -} - func (m *MsgUtilsCmd) AddLimitFlag() { m.Command.PersistentFlags().Int64P("limit", "l", 0, "openIM limit") } -func (m *MsgUtilsCmd) getLimitFlag(cmdLines *cobra.Command) int64 { - limit, _ := cmdLines.Flags().GetInt64("limit") - return limit -} - func (m *MsgUtilsCmd) Execute() error { return m.Command.Execute() } @@ -131,6 +113,7 @@ func NewSeqCmd() *SeqCmd { seqCmd := &SeqCmd{ NewMsgUtilsCmd("seq", "seq", nil), } + return seqCmd } @@ -158,6 +141,7 @@ func (s *SeqCmd) GetSeqCmd() *cobra.Command { // println(seq) } } + return &s.Command } @@ -173,6 +157,7 @@ func NewMsgCmd() *MsgCmd { msgCmd := &MsgCmd{ NewMsgUtilsCmd("msg", "msg", nil), } + return msgCmd } diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 4ea36cfeb..d1deb628c 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -17,8 +17,6 @@ package cmd import ( "fmt" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/spf13/cobra" "github.com/OpenIMSDK/protocol/constant" @@ -61,62 +59,81 @@ func NewRootCmd(name string, opts ...func(*CmdOpts)) *RootCmd { Short: fmt.Sprintf(`Start %s `, name), Long: fmt.Sprintf(`Start %s `, name), PersistentPreRunE: func(cmd *cobra.Command, args []string) error { - return rootCmd.persistentPreRun(cmd, opts...) + if err := rootCmd.getConfFromCmdAndInit(cmd); err != nil { + panic(err) + } + cmdOpts := &CmdOpts{} + for _, opt := range opts { + opt(cmdOpts) + } + if cmdOpts.loggerPrefixName == "" { + cmdOpts.loggerPrefixName = "OpenIM.log.all" + } + err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel, + config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation, + config.Config.Log.RemainRotationCount, config.Config.Log.RotationTime) + if err != nil { + panic(err) + } + + return nil }, } rootCmd.Command = cmd rootCmd.addConfFlag() + return rootCmd } -func (rc *RootCmd) persistentPreRun(cmd *cobra.Command, opts ...func(*CmdOpts)) error { - if err := rc.initializeConfiguration(cmd); err != nil { - return fmt.Errorf("failed to get configuration from command: %w", err) - } +// func (rc *RootCmd) persistentPreRun(cmd *cobra.Command, opts ...func(*CmdOpts)) error { +// if err := rc.initializeConfiguration(cmd); err != nil { +// return fmt.Errorf("failed to get configuration from command: %w", err) +// } - cmdOpts := rc.applyOptions(opts...) +// cmdOpts := rc.applyOptions(opts...) - if err := rc.initializeLogger(cmdOpts); err != nil { - return fmt.Errorf("failed to initialize from config: %w", err) - } +// if err := rc.initializeLogger(cmdOpts); err != nil { +// return fmt.Errorf("failed to initialize from config: %w", err) +// } - return nil -} +// return nil +// } +//nolint:unused //unused work wrongly func (rc *RootCmd) initializeConfiguration(cmd *cobra.Command) error { return rc.getConfFromCmdAndInit(cmd) } -func (rc *RootCmd) applyOptions(opts ...func(*CmdOpts)) *CmdOpts { - cmdOpts := defaultCmdOpts() - for _, opt := range opts { - opt(cmdOpts) - } +// func (rc *RootCmd) applyOptions(opts ...func(*CmdOpts)) *CmdOpts { +// cmdOpts := defaultCmdOpts() +// for _, opt := range opts { +// opt(cmdOpts) +// } - return cmdOpts -} +// return cmdOpts +// } -func (rc *RootCmd) initializeLogger(cmdOpts *CmdOpts) error { - logConfig := config.Config.Log - - return log.InitFromConfig( - - cmdOpts.loggerPrefixName, - rc.Name, - logConfig.RemainLogLevel, - logConfig.IsStdout, - logConfig.IsJson, - logConfig.StorageLocation, - logConfig.RemainRotationCount, - logConfig.RotationTime, - ) -} +// func (rc *RootCmd) initializeLogger(cmdOpts *CmdOpts) error { +// logConfig := config.Config.Log -func defaultCmdOpts() *CmdOpts { - return &CmdOpts{ - loggerPrefixName: "OpenIM.log.all", - } -} +// return log.InitFromConfig( + +// cmdOpts.loggerPrefixName, +// rc.Name, +// logConfig.RemainLogLevel, +// logConfig.IsStdout, +// logConfig.IsJson, +// logConfig.StorageLocation, +// logConfig.RemainRotationCount, +// logConfig.RotationTime, +// ) +// } + +// func defaultCmdOpts() *CmdOpts { +// return &CmdOpts{ +// loggerPrefixName: "OpenIM.log.all", +// } +// } func (r *RootCmd) SetRootCmdPt(cmdItf RootCmdPt) { r.cmdItf = cmdItf @@ -135,6 +152,7 @@ func (r *RootCmd) getPortFlag(cmd *cobra.Command) int { if port == 0 { port = r.PortFromConfig(constant.FlagPort) } + return port } @@ -151,6 +169,7 @@ func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) int { if port == 0 { port = r.PortFromConfig(constant.FlagPrometheusPort) } + return port } @@ -161,7 +180,8 @@ func (r *RootCmd) GetPrometheusPortFlag() int { func (r *RootCmd) getConfFromCmdAndInit(cmdLines *cobra.Command) error { configFolderPath, _ := cmdLines.Flags().GetString(constant.FlagConf) fmt.Println("configFolderPath:", configFolderPath) - return config2.InitConfig(configFolderPath) + + return config.InitConfig(configFolderPath) } func (r *RootCmd) Execute() error { @@ -174,9 +194,12 @@ func (r *RootCmd) AddCommand(cmds ...*cobra.Command) { func (r *RootCmd) GetPortFromConfig(portType string) int { fmt.Println("RootCmd.GetPortFromConfig:", portType) + return 0 } + func (r *RootCmd) PortFromConfig(portType string) int { fmt.Println("PortFromConfig:", portType) + return r.cmdItf.GetPortFromConfig(portType) } diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index 224edc0a0..6d34c6603 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -16,11 +16,13 @@ package cmd import ( "errors" + "github.com/OpenIMSDK/protocol/constant" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/spf13/cobra" "google.golang.org/grpc" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" @@ -33,6 +35,7 @@ type RpcCmd struct { func NewRpcCmd(name string) *RpcCmd { ret := &RpcCmd{NewRootCmd(name)} ret.SetRootCmdPt(ret) + return ret } @@ -41,6 +44,7 @@ func (a *RpcCmd) Exec() error { a.port = a.getPortFlag(cmd) a.prometheusPort = a.getPrometheusPortFlag(cmd) } + return a.Execute() } @@ -51,8 +55,10 @@ func (a *RpcCmd) StartSvr( if a.GetPortFlag() == 0 { return errors.New("port is required") } + return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn) } + func (a *RpcCmd) GetPortFromConfig(portType string) int { switch a.Name { case RpcPushServer: @@ -88,5 +94,6 @@ func (a *RpcCmd) GetPortFromConfig(portType string) int { return config2.Config.RpcPort.OpenImUserPort[0] } } + return 0 }