blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-28 14:42:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
truongpx-Mac 2023-11-23 17:46:41 +07:00
parent 37405b7366
commit ef19d5695a
7 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/openim-msgtransfer/main.go
View File

@ -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())
// }
}

3
cmd/openim-push/main.go
View File

@ -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 {

3
cmd/openim-rpc/openim-rpc-msg/main.go
View File

@ -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 {

1
config/config.yaml
View File

@ -196,6 +196,7 @@ rpcRegisterName:
openImMsgName: Msg
openImPushName: Push
openImMessageGatewayName: MessageGateway
openImMessageTransfer: MessageTransfer
openImGroupName: Group
openImAuthName: Auth
openImConversationName: Conversation

21
pkg/common/cmd/msg_transfer.go
View File

@ -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
// }

2
pkg/common/cmd/root.go
View File

@ -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:

1
pkg/common/config/config.go
View File

@ -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"`