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

fix bug:Implement option interface

Browse Source
This commit is contained in:
lin.huang 2023-10-08 19:43:15 +08:00
parent 60763a8417
commit 84032a536d
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest/helm-charts/services/config.yaml
View File

@ -209,15 +209,15 @@ config:
###################### RPC Register Name Configuration ###################### ###################### RPC Register Name Configuration ######################
# RPC service names for registration, it's not recommended to modify these # RPC service names for registration, it's not recommended to modify these
rpcRegisterName: rpcRegisterName:
openImUserName: openimserver-openim-rpc-user openImUserName: openimserver-openim-rpc-user:80
openImFriendName: openimserver-openim-rpc-friend openImFriendName: openimserver-openim-rpc-friend:80
openImMsgName: openimserver-openim-rpc-msg openImMsgName: openimserver-openim-rpc-msg:80
openImPushName: openimserver-openim-push openImPushName: openimserver-openim-push:80
openImMessageGatewayName: openimserver-openim-msggateway:88 openImMessageGatewayName: openimserver-openim-msggateway:88
openImGroupName: openimserver-openim-rpc-group openImGroupName: openimserver-openim-rpc-group:80
openImAuthName: openimserver-openim-rpc-auth openImAuthName: openimserver-openim-rpc-auth:80
openImConversationName: openimserver-openim-rpc-conversation openImConversationName: openimserver-openim-rpc-conversation:80
openImThirdName: openimserver-openim-rpc-third openImThirdName: openimserver-openim-rpc-third:80
###################### Log Configuration ###################### ###################### Log Configuration ######################
# Log configuration # Log configuration

7
pkg/common/discovery_register/k8s_discovery_register.go
View File

@ -34,6 +34,7 @@ func NewDiscoveryRegister(envType string) (discoveryregistry.SvcDiscoveryRegistr
} }
type K8sDR struct { type K8sDR struct {
options []grpc.DialOption
rpcRegisterAddr string rpcRegisterAddr string
} }
@ -65,19 +66,19 @@ func (cli *K8sDR) GetConfFromRegistry(key string) ([]byte, error) {
} }
func (cli *K8sDR) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) { func (cli *K8sDR) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) {
conn, err := grpc.DialContext(ctx, serviceName, grpc.WithInsecure()) conn, err := grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
return []*grpc.ClientConn{conn}, err return []*grpc.ClientConn{conn}, err
} }
func (cli *K8sDR) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { func (cli *K8sDR) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
return grpc.DialContext(ctx, serviceName, grpc.WithInsecure()) return grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
} }
func (cli *K8sDR) GetSelfConnTarget() string { func (cli *K8sDR) GetSelfConnTarget() string {
return cli.rpcRegisterAddr return cli.rpcRegisterAddr
} }
func (cli *K8sDR) AddOption(opts ...grpc.DialOption) { func (cli *K8sDR) AddOption(opts ...grpc.DialOption) {
cli.options = append(cli.options, opts...)
} }
func (cli *K8sDR) CloseConn(conn *grpc.ClientConn) { func (cli *K8sDR) CloseConn(conn *grpc.ClientConn) {
conn.Close() conn.Close()