unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 281 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats 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 // 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} 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 // 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} 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 // 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} callOpts.Address = []string{r.opts.Proxy}
} }
@ -480,7 +480,7 @@ func (r *rpcClient) Stream(ctx context.Context, request client.Request, opts ...
} }
// inject proxy address // 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} callOpts.Address = []string{r.opts.Proxy}
} }

6
router/registry/registry.go
View File

@ -188,8 +188,14 @@ func (r *rtr) fetchRoutes(service string) error {
for _, srv := range services { for _, srv := range services {
var domain string var domain string
// since a wildcard query was performed, the service could belong
// to one of many namespaces, to get this information we check
// the node metadata. TODO: Add Domain to registry.Service
if srv.Metadata != nil && len(srv.Metadata["domain"]) > 0 { if srv.Metadata != nil && len(srv.Metadata["domain"]) > 0 {
domain = srv.Metadata["domain"] domain = srv.Metadata["domain"]
} else if len(srv.Nodes) > 0 && srv.Nodes[0].Metadata != nil {
domain = srv.Nodes[0].Metadata["domain"]
} else { } else {
domain = registry.WildcardDomain domain = registry.WildcardDomain
} }