unistack-org/micro-client-grpc
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases 40 Wiki Activity

Conceptual deliverable

Browse Source
This commit is contained in:
orb li
2019-10-10 13:55:16 +08:00
committed by Vasiliy Tolstov
parent ab876bfc74
commit cb8ba30ac5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
grpc.go
View File

@@ -541,11 +541,11 @@ func (g *grpcClient) String() string {
}
func (g *grpcClient) getGrpcDialOptions() []grpc.DialOption {
if g.opts.Context == nil {
if g.opts.CallOptions.Context == nil {
return nil
}
v := g.opts.Context.Value(grpcDialOptions{})
v := g.opts.CallOptions.Context.Value(grpcDialOptions{})
if v == nil {
return nil

14
options.go
View File

@@ -79,8 +79,8 @@ func MaxSendMsgSize(s int) client.Option {
//
// DialOptions to be used to configure gRPC dial options
//
func DialOptions(opts ...grpc.DialOption) client.Option {
return func(o *client.Options) {
func DialOptions(opts ...grpc.DialOption) client.CallOption {
return func(o *client.CallOptions) {
if o.Context == nil {
o.Context = context.Background()
}
@@ -91,11 +91,11 @@ func DialOptions(opts ...grpc.DialOption) client.Option {
//
// CallOptions to be used to configure gRPC call options
//
func CallOptions(opts ...grpc.CallOption) client.Option {
return func(o *client.Options) {
if o.CallOptions.Context == nil {
o.CallOptions.Context = context.Background()
func CallOptions(opts ...grpc.CallOption) client.CallOption {
return func(o *client.CallOptions) {
if o.Context == nil {
o.Context = context.Background()
}
o.CallOptions.Context = context.WithValue(o.CallOptions.Context, grpcCallOptions{}, opts)
o.Context = context.WithValue(o.Context, grpcCallOptions{}, opts)
}
}