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

feat: multiple addresses

Browse Source
This commit is contained in:
AndrewZuo01 2024-01-16 15:55:30 +08:00
parent 17d0af3bdf
commit 4ab677e7d8
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/common/discoveryregister/direct/directconn.go
View File

@ -84,14 +84,19 @@ func (cm *ConnManager) GetConns(ctx context.Context,
}
ports := getServiceAddresses()[serviceName]
var connections []*grpc.ClientConn
var result string
for _, port := range ports {
conn, err := dialService(ctx, fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", port), append(cm.additionalOpts, opts...)...)
if err != nil {
fmt.Errorf("connect to port %s failed,serviceName %s, IP %s", port, serviceName, config2.Config.Rpc.ListenIP)
continue
if result != "" {
result = result + "," + fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", port)
} else {
result = fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", port)
}
connections = append(connections, conn)
}
conn, err := dialService(ctx, result, append(cm.additionalOpts, opts...)...)
if err != nil {
fmt.Errorf("connect to port %s failed,serviceName %s, IP %s", result, serviceName, config2.Config.Rpc.ListenIP)
}
connections = append(connections, conn)
if len(connections) == 0 {
return nil, fmt.Errorf("no connections found for service: %s", serviceName)
}
@ -106,11 +111,18 @@ func (cm *ConnManager) GetConn(ctx context.Context, serviceName string, opts ...
if !ok {
return nil, errs.Wrap(errors.New("unknown service name"), "serviceName", serviceName)
}
randomIndex := rand.Intn(len(address))
var result string
for _, addr := range address {
if result != "" {
result = result + "," + fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", addr)
} else {
result = fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", addr)
}
}
// Try to dial a new connection
conn, err := dialService(ctx, fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", address[randomIndex]), append(cm.additionalOpts, opts...)...)
conn, err := dialService(ctx, result, append(cm.additionalOpts, opts...)...)
if err != nil {
return nil, errs.Wrap(err, "address", fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", address[randomIndex]))
return nil, errs.Wrap(err, "address", result)
}
// Store the new connection