Merge branch 'master' into registy-not-found
This commit is contained in:
commit
56f281002b
@ -48,6 +48,10 @@ func (s *serviceRegistry) Init(opts ...registry.Option) error {
|
|||||||
o(&s.opts)
|
o(&s.opts)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(s.opts.Addrs) > 0 {
|
||||||
|
s.address = s.opts.Addrs
|
||||||
|
}
|
||||||
|
|
||||||
// extract the client from the context, fallback to grpc
|
// extract the client from the context, fallback to grpc
|
||||||
var cli client.Client
|
var cli client.Client
|
||||||
if c, ok := s.opts.Context.Value(clientKey{}).(client.Client); ok {
|
if c, ok := s.opts.Context.Value(clientKey{}).(client.Client); ok {
|
||||||
|
Loading…
Reference in New Issue
Block a user