From 7fe64192a7f59e0bf6989c2a3e86501a0fbccb6d Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Wed, 25 Sep 2019 11:09:19 +0100 Subject: [PATCH] Add flag for registry service client --- config/cmd/cmd.go | 11 +++++++---- registry/service/service.go | 11 +++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/config/cmd/cmd.go b/config/cmd/cmd.go index 512ed83d..d6ee3eb2 100644 --- a/config/cmd/cmd.go +++ b/config/cmd/cmd.go @@ -30,6 +30,7 @@ import ( "github.com/micro/go-micro/registry/gossip" "github.com/micro/go-micro/registry/mdns" rmem "github.com/micro/go-micro/registry/memory" + regSrv "github.com/micro/go-micro/registry/service" // selectors "github.com/micro/go-micro/client/selector" @@ -190,10 +191,12 @@ var ( } DefaultRegistries = map[string]func(...registry.Option) registry.Registry{ - "consul": consul.NewRegistry, - "gossip": gossip.NewRegistry, - "mdns": mdns.NewRegistry, - "memory": rmem.NewRegistry, + "go.micro.registry": regSrv.NewRegistry, + "service": regSrv.NewRegistry, + "consul": consul.NewRegistry, + "gossip": gossip.NewRegistry, + "mdns": mdns.NewRegistry, + "memory": rmem.NewRegistry, } DefaultSelectors = map[string]func(...selector.Option) selector.Selector{ diff --git a/registry/service/service.go b/registry/service/service.go index 2473c32f..4af5ab40 100644 --- a/registry/service/service.go +++ b/registry/service/service.go @@ -134,7 +134,14 @@ func NewRegistry(opts ...registry.Option) registry.Registry { o(&options) } - // use mdns to find the service registry + // the registry address + addrs := options.Addrs + + if len(addrs) == 0 { + addrs = []string{"127.0.0.1:8000"} + } + + // use mdns as a fall back in case its used mReg := registry.NewRegistry() // create new client with mdns @@ -149,7 +156,7 @@ func NewRegistry(opts ...registry.Option) registry.Registry { return &serviceRegistry{ opts: options, name: name, - address: options.Addrs, + address: addrs, client: pb.NewRegistryService(name, cli), } }