IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-12 13:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source 
 Conflicts:
	internal/api_to_rpc/api.go
	internal/rpc/group/group.go
This commit is contained in:
wangchuxiao
2023-01-11 16:27:20 +08:00
parent c96ccfc7f5 920fcc14f1
commit edced72be9
6 changed files with 360 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/fault_tolerant/conn.go
+2 -1
View File
@@ -3,6 +3,7 @@ package fault_tolerant
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/common/middleware"
"Open_IM/pkg/utils"
"github.com/OpenIMSDK/getcdv3"
"google.golang.org/grpc"
@@ -75,7 +76,7 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn {
}
target := rpcRegisterIP + ":" + utils.Int32ToString(int32(configPortList[0]))
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(), grpc.WithUnaryInterceptor(middleware.RpcClientInterceptor))
if err != nil {
log.Error(operationID, "grpc.Dail failed ", err.Error())
return nil
internal/rpc/group/group.go
+156 -416
View File
File diff suppressed because it is too large Load Diff