diff --git a/cmd/openim-msgtransfer/main.go b/cmd/openim-msgtransfer/main.go index 722bf5960..c5ac1766b 100644 --- a/cmd/openim-msgtransfer/main.go +++ b/cmd/openim-msgtransfer/main.go @@ -16,12 +16,20 @@ package main import ( "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { msgTransferCmd := cmd.NewMsgTransferCmd() + msgTransferCmd.PreLoadConfig() + msgTransferCmd.SetSvcName(config.Config.RpcRegisterName.OpenImMessageTransfer) + msgTransferCmd.AddPrometheusPortFlag() if err := msgTransferCmd.Exec(); err != nil { panic(err.Error()) } + + // if err := msgTransferCmd.StartSvr(config.Config.RpcRegisterName.OpenImMessageTransfer, msgTransferCmd.Start); err != nil { + // panic(err.Error()) + // } } diff --git a/cmd/openim-push/main.go b/cmd/openim-push/main.go index 6ab2fedab..2ef42375f 100644 --- a/cmd/openim-push/main.go +++ b/cmd/openim-push/main.go @@ -22,6 +22,9 @@ import ( func main() { pushCmd := cmd.NewRpcCmd("push") + pushCmd.PreLoadConfig() + pushCmd.SetSvcName(config.Config.RpcRegisterName.OpenImPushName) + pushCmd.AddPortFlag() pushCmd.AddPrometheusPortFlag() if err := pushCmd.Exec(); err != nil { diff --git a/cmd/openim-rpc/openim-rpc-msg/main.go b/cmd/openim-rpc/openim-rpc-msg/main.go index 0ac258d0c..42f1c856d 100644 --- a/cmd/openim-rpc/openim-rpc-msg/main.go +++ b/cmd/openim-rpc/openim-rpc-msg/main.go @@ -22,6 +22,9 @@ import ( func main() { rpcCmd := cmd.NewRpcCmd("msg") + rpcCmd.PreLoadConfig() + rpcCmd.SetSvcName(config.Config.RpcRegisterName.OpenImMsgName) + rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() if err := rpcCmd.Exec(); err != nil { diff --git a/config/config.yaml b/config/config.yaml index d1cde9b45..f1ce977b8 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -196,6 +196,7 @@ rpcRegisterName: openImMsgName: Msg openImPushName: Push openImMessageGatewayName: MessageGateway + openImMessageTransfer: MessageTransfer openImGroupName: Group openImAuthName: Auth openImConversationName: Conversation diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index ae67ee9f7..7d3432c43 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -30,7 +30,12 @@ func NewMsgTransferCmd() MsgTransferCmd { func (m *MsgTransferCmd) addRunE() { m.Command.RunE = func(cmd *cobra.Command, args []string) error { - return msgtransfer.StartTransfer(m.getPrometheusPortFlag(cmd)) + promePort := m.getPrometheusPortFlag(cmd) + if promePort == 0 { + promePort = m.GetPrometheusPortFlag() + } + + return msgtransfer.StartTransfer(promePort) } } @@ -38,3 +43,17 @@ func (m *MsgTransferCmd) Exec() error { m.addRunE() return m.Execute() } + +// func (a *MsgTransferCmd) StartSvr( +// name string, +// rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, +// ) error { +// if a.GetPortFlag() == 0 { +// return errors.New("port is required") +// } +// return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn) +// } + +// func (a *MsgTransferCmd) Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error { +// return nil +// } diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 048d4adf2..e13a0004f 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -135,6 +135,8 @@ func (r *RootCmd) GetPrometheusPortFlag() int { return config.Config.Prometheus.PushPrometheusPort[0] case config.Config.RpcRegisterName.OpenImMessageGatewayName: return config.Config.Prometheus.MessageGatewayPrometheusPort[0] + case config.Config.RpcRegisterName.OpenImMessageTransfer: + return config.Config.Prometheus.MessageTransferPrometheusPort[0] case config.Config.RpcRegisterName.OpenImThirdName: return config.Config.Prometheus.ThirdPrometheusPort[0] default: diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index b0746449b..6e7b6d716 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -167,6 +167,7 @@ type configStruct struct { OpenImMsgName string `yaml:"openImMsgName"` OpenImPushName string `yaml:"openImPushName"` OpenImMessageGatewayName string `yaml:"openImMessageGatewayName"` + OpenImMessageTransfer string `yaml:"openImMessageTransfer"` OpenImGroupName string `yaml:"openImGroupName"` OpenImAuthName string `yaml:"openImAuthName"` OpenImConversationName string `yaml:"openImConversationName"`