diff --git a/registry/directory/directory.go b/registry/directory/directory.go index 54f0acd8433f8eb1bbefb36403248056f70177de..b6794e2ebf212ec024d73335ddb19441afa5b96e 100644 --- a/registry/directory/directory.go +++ b/registry/directory/directory.go @@ -40,10 +40,6 @@ import ( "github.com/apache/dubbo-go/registry" ) -const ( - RegistryConnDelay = 3 -) - type Options struct { serviceTTL time.Duration } @@ -87,7 +83,7 @@ func NewRegistryDirectory(url *common.URL, registry registry.Registry, opts ...O return dir, nil } -//subscibe from registry +//subscribe from registry func (dir *registryDirectory) Subscribe(url *common.URL) { dir.consumerConfigurationListener.addNotifyListener(dir) dir.referenceConfigurationListener = newReferenceConfigurationListener(dir, url) @@ -245,6 +241,7 @@ func (dir *registryDirectory) Destroy() { dir.cacheInvokers = []protocol.Invoker{} }) } + func (dir *registryDirectory) overrideUrl(targetUrl *common.URL) { doOverrideUrl(dir.configurators, targetUrl) doOverrideUrl(dir.consumerConfigurationListener.Configurators(), targetUrl) @@ -293,9 +290,11 @@ func newConsumerConfigurationListener(dir *registryDirectory) *consumerConfigura ) return listener } + func (l *consumerConfigurationListener) addNotifyListener(listener registry.NotifyListener) { l.listeners = append(l.listeners, listener) } + func (l *consumerConfigurationListener) Process(event *config_center.ConfigChangeEvent) { l.BaseConfigurationListener.Process(event) l.directory.refreshInvokers(nil) diff --git a/registry/etcdv3/registry.go b/registry/etcdv3/registry.go index 8bb1ff430eb8e674666266af5169bba4b4e22d30..bf097f0b59573bc8d811015105065d6e2e1eb386 100644 --- a/registry/etcdv3/registry.go +++ b/registry/etcdv3/registry.go @@ -330,7 +330,7 @@ func (r *etcdV3Registry) subscribe(svc *common.URL) (registry.Listener, error) { return configListener, nil } -//subscibe from registry +//subscribe from registry func (r *etcdV3Registry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) { for { if !r.IsAvailable() { diff --git a/registry/nacos/registry.go b/registry/nacos/registry.go index f1a78264ce431745181ca6f633eda642cf90a31e..7025b3e5d4aaa992d58f08ca4802c4f66b2b337b 100644 --- a/registry/nacos/registry.go +++ b/registry/nacos/registry.go @@ -172,15 +172,15 @@ func (nr *nacosRegistry) subscribe(conf *common.URL) (registry.Listener, error) return NewNacosListener(*conf, nr.namingClient) } -//subscibe from registry -func (r *nacosRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) { +//subscribe from registry +func (nr *nacosRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) { for { - if !r.IsAvailable() { + if !nr.IsAvailable() { logger.Warnf("event listener game over.") return } - listener, err := r.subscribe(url) + listener, err := nr.subscribe(url) if err != nil { if !r.IsAvailable() { logger.Warnf("event listener game over.") @@ -205,6 +205,7 @@ func (r *nacosRegistry) Subscribe(url *common.URL, notifyListener registry.Notif } } + func (nr *nacosRegistry) GetUrl() common.URL { return *nr.URL } diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index e14541dd04691bf89825b1d77d79932ad54f7720..972a4b6c5e0af7e53e9aad6df33209d15f71a587 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -147,6 +147,7 @@ func newMockZkRegistry(url *common.URL, opts ...zookeeper.Option) (*zk.TestClust return c, r, nil } + func (r *zkRegistry) ZkClient() *zookeeper.ZookeeperClient { return r.client } @@ -399,7 +400,7 @@ func (r *zkRegistry) subscribe(conf *common.URL) (registry.Listener, error) { return r.getListener(conf) } -//subscibe from registry +//subscribe from registry func (r *zkRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) { for { if !r.IsAvailable() { @@ -432,6 +433,7 @@ func (r *zkRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyLi } } + func (r *zkRegistry) getListener(conf *common.URL) (*RegistryConfigurationListener, error) { var ( zkListener *RegistryConfigurationListener