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

get grpc conn from config

Browse Source
This commit is contained in:
skiffer-git 2022-08-17 11:42:12 +08:00
parent 92d7ecdf68
commit 85a52f5d6b
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.yaml
View File

@ -150,6 +150,7 @@ rpcport: #rpc服务端口 默认即可
openImOrganizationPort: [ 10220 ] openImOrganizationPort: [ 10220 ]
openImConversationPort: [ 10230 ] openImConversationPort: [ 10230 ]
openImCachePort: [ 10240 ] openImCachePort: [ 10240 ]
openImRealTimeCommPort: [ 11300 ]
c2c: c2c:
callbackBeforeSendMsg: callbackBeforeSendMsg:
switch: false switch: false

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

@ -128,6 +128,7 @@ type config struct {
OpenImOrganizationPort []int `yaml:"openImOrganizationPort"` OpenImOrganizationPort []int `yaml:"openImOrganizationPort"`
OpenImConversationPort []int `yaml:"openImConversationPort"` OpenImConversationPort []int `yaml:"openImConversationPort"`
OpenImCachePort []int `yaml:"openImCachePort"` OpenImCachePort []int `yaml:"openImCachePort"`
OpenImRealTimeCommPort []int `yaml:"openImRealTimeCommPort"`
} }
RpcRegisterName struct { RpcRegisterName struct {
OpenImStatisticsName string `yaml:"openImStatisticsName"` OpenImStatisticsName string `yaml:"openImStatisticsName"`

34
pkg/grpc-etcdv3/getcdv3/resolver.go
View File

@ -103,7 +103,7 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn {
if config.Config.RpcRegisterIP == "" { if config.Config.RpcRegisterIP == "" {
rpcRegisterIP, err = utils.GetLocalIP() rpcRegisterIP, err = utils.GetLocalIP()
if err != nil { if err != nil {
log.Error("", "GetLocalIP failed ", err.Error()) log.Error(operationID, "GetLocalIP failed ", err.Error())
return nil return nil
} }
} }
@ -111,27 +111,27 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn {
var configPortList []int var configPortList []int
//1 //1
if config.Config.RpcRegisterName.OpenImUserName == serviceName { if config.Config.RpcRegisterName.OpenImUserName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImUserPort
} }
//2 //2
if config.Config.RpcRegisterName.OpenImFriendName == serviceName { if config.Config.RpcRegisterName.OpenImFriendName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImFriendPort
} }
//3 //3
if config.Config.RpcRegisterName.OpenImMsgName == serviceName { if config.Config.RpcRegisterName.OpenImMsgName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImMessagePort
} }
//4 //4
if config.Config.RpcRegisterName.OpenImPushName == serviceName { if config.Config.RpcRegisterName.OpenImPushName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImPushPort
} }
//5 //5
if config.Config.RpcRegisterName.OpenImRelayName == serviceName { if config.Config.RpcRegisterName.OpenImRelayName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenIm
} }
//6 //6
if config.Config.RpcRegisterName.OpenImGroupName == serviceName { if config.Config.RpcRegisterName.OpenImGroupName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImGroupPort
} }
//7 //7
if config.Config.RpcRegisterName.OpenImAuthName == serviceName { if config.Config.RpcRegisterName.OpenImAuthName == serviceName {
@ -139,41 +139,41 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn {
} }
//8 //8
if config.Config.RpcRegisterName.OpenImMessageCMSName == serviceName { if config.Config.RpcRegisterName.OpenImMessageCMSName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImMessageCmsPort
} }
//9 //9
if config.Config.RpcRegisterName.OpenImAdminCMSName == serviceName { if config.Config.RpcRegisterName.OpenImAdminCMSName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImAdminCmsPort
} }
//10 //10
if config.Config.RpcRegisterName.OpenImOfficeName == serviceName { if config.Config.RpcRegisterName.OpenImOfficeName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImOfficePort
} }
//11 //11
if config.Config.RpcRegisterName.OpenImOrganizationName == serviceName { if config.Config.RpcRegisterName.OpenImOrganizationName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImOrganizationPort
} }
//12 //12
if config.Config.RpcRegisterName.OpenImConversationName == serviceName { if config.Config.RpcRegisterName.OpenImConversationName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImConversationPort
} }
//13 //13
if config.Config.RpcRegisterName.OpenImCacheName == serviceName { if config.Config.RpcRegisterName.OpenImCacheName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImCachePort
} }
//14 //14
if config.Config.RpcRegisterName.OpenImRealTimeCommName == serviceName { if config.Config.RpcRegisterName.OpenImRealTimeCommName == serviceName {
configPortList = config.Config.RpcPort.OpenImAuthPort configPortList = config.Config.RpcPort.OpenImRealTimeCommPort
} }
if len(configPortList) == 0 { if len(configPortList) == 0 {
log.Error("", "len(configPortList) == 0 ") log.Error(operationID, "len(configPortList) == 0 ")
return nil return nil
} }
target := rpcRegisterIP + ":" + utils.Int32ToString(int32(configPortList[0])) target := rpcRegisterIP + ":" + utils.Int32ToString(int32(configPortList[0]))
log.Info("", "rpcRegisterIP ", rpcRegisterIP, "port ", configPortList, "grpc target: ", target, "serviceName: ", serviceName) log.Info(operationID, "rpcRegisterIP ", rpcRegisterIP, " port ", configPortList, " grpc target: ", target, " serviceName: ", serviceName)
conn, err := grpc.Dial(target, grpc.WithInsecure()) conn, err := grpc.Dial(target, grpc.WithInsecure())
if err != nil { if err != nil {
log.Error("", "grpc.Dail failed ", err.Error()) log.Error(operationID, "grpc.Dail failed ", err.Error())
return nil return nil
} }
return conn return conn