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

update

Browse Source
This commit is contained in:
truongpx-Mac 2023-11-23 13:12:21 +07:00
parent 593972e9c9
commit dc7426c54f
6 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cmd/openim-rpc/openim-rpc-auth/__debug_bin
View File

Binary file not shown.

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

@ -22,6 +22,9 @@ import (
func main() { func main() {
authCmd := cmd.NewRpcCmd("auth") authCmd := cmd.NewRpcCmd("auth")
authCmd.PreLoadConfig()
authCmd.SetSvcName(config.Config.RpcRegisterName.OpenImAuthName)
authCmd.AddPortFlag() authCmd.AddPortFlag()
authCmd.AddPrometheusPortFlag() authCmd.AddPrometheusPortFlag()
if err := authCmd.Exec(); err != nil { if err := authCmd.Exec(); err != nil {

BIN
cmd/openim-rpc/openim-rpc-user/__debug_bin
View File

Binary file not shown.

6
cmd/openim-rpc/openim-rpc-user/main.go
View File

@ -21,12 +21,16 @@ import (
) )
func main() { func main() {
rpcCmd := cmd.NewRpcCmd("user") rpcCmd := cmd.NewRpcCmd("")
rpcCmd.PreLoadConfig()
rpcCmd.SetSvcName(config.Config.RpcRegisterName.OpenImUserName)
rpcCmd.AddPortFlag() rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag() rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(); err != nil { if err := rpcCmd.Exec(); err != nil {
panic(err.Error()) panic(err.Error())
} }
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil { if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil {
panic(err.Error()) panic(err.Error())
} }

4
config/config.yaml
View File

@ -185,7 +185,7 @@ rpcPort:
openImGroupPort: [ 10150 ] openImGroupPort: [ 10150 ]
openImAuthPort: [ 10160 ] openImAuthPort: [ 10160 ]
openImPushPort: [ 10170 ] openImPushPort: [ 10170 ]
openImConversationPort: [ 10180 ] openImConversationPort: [ 10230 ]
openImThirdPort: [ 10190 ] openImThirdPort: [ 10190 ]
###################### RPC Register Name Configuration ###################### ###################### RPC Register Name Configuration ######################
@ -405,5 +405,5 @@ prometheus:
pushPrometheusPort: [ 20170 ] pushPrometheusPort: [ 20170 ]
conversationPrometheusPort: [ 20230 ] conversationPrometheusPort: [ 20230 ]
rtcPrometheusPort: [ 21300 ] rtcPrometheusPort: [ 21300 ]
thirdPrometheusPort: [ 21301 ] thirdPrometheusPort: [ 20190 ]
messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

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

@ -78,6 +78,16 @@ func NewRootCmd(name string, opts ...func(*CmdOpts)) (rootCmd *RootCmd) {
return rootCmd return rootCmd
} }
func (r *RootCmd) PreLoadConfig() {
if err := config2.InitConfig(""); err != nil {
panic(err)
}
}
func (r *RootCmd) SetSvcName(name string) {
r.Name = name
}
func (r *RootCmd) addConfFlag() { func (r *RootCmd) addConfFlag() {
r.Command.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder") r.Command.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder")
} }
@ -105,6 +115,34 @@ func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) int {
} }
func (r *RootCmd) GetPrometheusPortFlag() int { func (r *RootCmd) GetPrometheusPortFlag() int {
if r.prometheusPort == 0 {
switch r.Name {
case config.Config.RpcRegisterName.OpenImAuthName:
return config.Config.Prometheus.AuthPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImUserName:
return config.Config.Prometheus.UserPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImFriendName:
return config.Config.Prometheus.FriendPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImGroupName:
return config.Config.Prometheus.GroupPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImMsgName:
return config.Config.Prometheus.MessagePrometheusPort[0]
case config.Config.RpcRegisterName.OpenImConversationName:
return config.Config.Prometheus.ConversationPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImConversationName:
return config.Config.Prometheus.ConversationPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImPushName:
return config.Config.Prometheus.PushPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImMessageGatewayName:
return config.Config.Prometheus.MessageGatewayPrometheusPort[0]
case config.Config.RpcRegisterName.OpenImThirdName:
return config.Config.Prometheus.ThirdPrometheusPort[0]
default:
return 0
}
}
return r.prometheusPort return r.prometheusPort
} }