unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

Fix proxy being overriden by default addresses (#1886)

Browse Source
This commit is contained in:
ben-toogood
2020-07-31 08:55:08 +01:00
committed by GitHub
parent e9fc5b1671
commit 83a64797fb
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/grpc/grpc.go
View File

@@ -412,7 +412,7 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
}
// inject proxy address
if len(callOpts.Address) == 0 && len(g.opts.Proxy) > 0 {
if len(g.opts.Proxy) > 0 {
callOpts.Address = []string{g.opts.Proxy}
}
@@ -520,7 +520,7 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
}
// inject proxy address
if len(callOpts.Address) == 0 && len(g.opts.Proxy) > 0 {
if len(g.opts.Proxy) > 0 {
callOpts.Address = []string{g.opts.Proxy}
}

4
client/mucp/mucp.go
View File

@@ -379,7 +379,7 @@ func (r *rpcClient) Call(ctx context.Context, request client.Request, response i
}
// inject proxy address
if len(callOpts.Address) == 0 && len(r.opts.Proxy) > 0 {
if len(r.opts.Proxy) > 0 {
callOpts.Address = []string{r.opts.Proxy}
}
@@ -480,7 +480,7 @@ func (r *rpcClient) Stream(ctx context.Context, request client.Request, opts ...
}
// inject proxy address
if len(callOpts.Address) == 0 && len(r.opts.Proxy) > 0 {
if len(r.opts.Proxy) > 0 {
callOpts.Address = []string{r.opts.Proxy}
}