From 2699fccd2ac7d0a7f77aabe890c2a8b7aefa0a73 Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Tue, 19 May 2020 08:37:33 +0800
Subject: [PATCH] fix review problems
---
registry/etcdv3/registry.go | 2 +-
registry/kubernetes/registry.go | 3 +--
registry/zookeeper/registry.go | 4 +---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/registry/etcdv3/registry.go b/registry/etcdv3/registry.go
index a2722a2e6..a65d09034 100644
--- a/registry/etcdv3/registry.go
+++ b/registry/etcdv3/registry.go
@@ -115,7 +115,7 @@ func (r *etcdV3Registry) DoRegister(root string, node string) error {
}
func (r *etcdV3Registry) DoUnregister(root string, node string) error {
- return r.client.Delete(path.Join(root, node))
+ return perrors.New("DoUnregister is not support in etcdV3Registry")
}
func (r *etcdV3Registry) CloseAndNilClient() {
diff --git a/registry/kubernetes/registry.go b/registry/kubernetes/registry.go
index e64f9acb0..7ee0f6b0e 100644
--- a/registry/kubernetes/registry.go
+++ b/registry/kubernetes/registry.go
@@ -108,8 +108,7 @@ func (r *kubernetesRegistry) DoRegister(root string, node string) error {
}
func (r *kubernetesRegistry) DoUnregister(root string, node string) error {
- panic("DoUnregister is not support in kubernetesRegistry")
- return nil
+ return perrors.New("DoUnregister is not support in kubernetesRegistry")
}
func (r *kubernetesRegistry) DoSubscribe(svc *common.URL) (registry.Listener, error) {
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index f51ec6718..e68265068 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -279,12 +279,9 @@ func (r *zkRegistry) getCloseListener(conf *common.URL) (*RegistryConfigurationL
zkListener, _ := configurationListener.(*RegistryConfigurationListener)
if zkListener != nil {
- r.listenerLock.Lock()
if zkListener.isClosed {
- r.listenerLock.Unlock()
return nil, perrors.New("configListener already been closed")
}
- r.listenerLock.Unlock()
}
}
@@ -299,6 +296,7 @@ func (r *zkRegistry) getCloseListener(conf *common.URL) (*RegistryConfigurationL
r.listenerLock.Lock()
listener := r.listener
r.listener = nil
+ r.listenerLock.Unlock()
r.dataListener.Close()
listener.Close()
--
GitLab