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

feat: direct conn with multiple ports

Browse Source
This commit is contained in:
AndrewZuo01 2024-01-16 17:47:03 +08:00
parent 2fd61980c0
commit 632e51c768
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import (
"github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/errs"
config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"net" "net"
"time" "time"
) )
@ -27,7 +28,6 @@ func getServiceAddresses() ServiceAddresses {
} }
} }
// fmt.Sprintf(config2.Config.Rpc.ListenIP+":%d", config2.Config.RpcPort.OpenImUserPort[0])
type ConnDirect struct { type ConnDirect struct {
additionalOpts []grpc.DialOption additionalOpts []grpc.DialOption
currentServiceAddress string currentServiceAddress string
@ -137,7 +137,7 @@ func (cd *ConnDirect) CloseConn(conn *grpc.ClientConn) {
} }
func (cd *ConnDirect) dialService(ctx context.Context, address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { func (cd *ConnDirect) dialService(ctx context.Context, address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
options := append(opts, grpc.WithInsecure()) // Replace WithInsecure with proper security options options := append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
conn, err := grpc.DialContext(ctx, cd.resolverDirect.Scheme()+":///"+address, options...) conn, err := grpc.DialContext(ctx, cd.resolverDirect.Scheme()+":///"+address, options...)
if err != nil { if err != nil {
@ -146,7 +146,7 @@ func (cd *ConnDirect) dialService(ctx context.Context, address string, opts ...g
return conn, nil return conn, nil
} }
func (cd *ConnDirect) dialServiceWithoutResolver(ctx context.Context, address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { func (cd *ConnDirect) dialServiceWithoutResolver(ctx context.Context, address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
options := append(opts, grpc.WithInsecure()) // Replace WithInsecure with proper security options options := append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
conn, err := grpc.DialContext(ctx, address, options...) conn, err := grpc.DialContext(ctx, address, options...)
if err != nil { if err != nil {