From 3ae2a82ec79f77273cfeff963702bd80fb1d2520 Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Mon, 1 Jun 2020 15:21:28 +0800
Subject: [PATCH] revert changes for CloseAndNilClient
---
registry/etcdv3/registry.go | 8 +-------
registry/kubernetes/registry.go | 8 +-------
registry/zookeeper/registry.go | 9 +--------
3 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/registry/etcdv3/registry.go b/registry/etcdv3/registry.go
index a94352c66..a65d09034 100644
--- a/registry/etcdv3/registry.go
+++ b/registry/etcdv3/registry.go
@@ -119,14 +119,8 @@ func (r *etcdV3Registry) DoUnregister(root string, node string) error {
}
func (r *etcdV3Registry) CloseAndNilClient() {
- r.cltLock.Lock()
- client := r.client
+ r.client.Close()
r.client = nil
- r.cltLock.Unlock()
- if client == nil {
- return
- }
- client.Close()
}
func (r *etcdV3Registry) CloseListener() {
diff --git a/registry/kubernetes/registry.go b/registry/kubernetes/registry.go
index 4c59fc080..7ee0f6b0e 100644
--- a/registry/kubernetes/registry.go
+++ b/registry/kubernetes/registry.go
@@ -81,14 +81,8 @@ func (r *kubernetesRegistry) SetClient(client *kubernetes.Client) {
}
func (r *kubernetesRegistry) CloseAndNilClient() {
- r.cltLock.Lock()
- client := r.client
+ r.client.Close()
r.client = nil
- r.cltLock.Unlock()
- if client == nil {
- return
- }
- client.Close()
}
func (r *kubernetesRegistry) CloseListener() {
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index fd6ef86e7..32f9fe7a2 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -176,15 +176,8 @@ func (r *zkRegistry) DoUnsubscribe(conf *common.URL) (registry.Listener, error)
}
func (r *zkRegistry) CloseAndNilClient() {
- r.cltLock.Lock()
- client := r.client
+ r.client.Close()
r.client = nil
- r.cltLock.Unlock()
-
- if client == nil {
- return
- }
- client.Close()
}
func (r *zkRegistry) ZkClient() *zookeeper.ZookeeperClient {
--
GitLab