Fix: zk client multi usage of zkname

justxuewei · Jun 17, 2021 · 8f6db74 · 8f6db74
1 parent 6ee163b
commit 8f6db74
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go
@@ -64,7 +64,7 @@ func newZookeeperDynamicConfiguration(url *common.URL) (*zookeeperDynamicConfigu
 		url:      url,
 		rootPath: "/" + url.GetParam(constant.CONFIG_NAMESPACE_KEY, config_center.DEFAULT_GROUP) + "/config",
 	}
-	err := zookeeper.ValidateZookeeperClient(c, ZkClient)
+	err := zookeeper.ValidateZookeeperClient(c, url.Location)
 	if err != nil {
 		logger.Errorf("zookeeper client start error ,error message is %v", err)
 		return nil, err

diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
@@ -40,11 +40,6 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/remoting/zookeeper"
 )
 
-const (
-	// RegistryZkClient zk client name
-	RegistryZkClient = "zk registry"
-)
-
 func init() {
 	extension.SetRegistry("zookeeper", newZkRegistry)
 }

diff --git a/registry/zookeeper/service_discovery.go b/registry/zookeeper/service_discovery.go
@@ -45,7 +45,7 @@ import (
 )
 
 const (
-	// RegistryZkClient zk client name
+	// ServiceDiscoveryZkClient zk client name
 	ServiceDiscoveryZkClient = "zk service discovery"
 )
 
@@ -108,7 +108,7 @@ func newZookeeperServiceDiscovery(name string) (registry.ServiceDiscovery, error
 		url:      url,
 		rootPath: rootPath,
 	}
-	err := zookeeper.ValidateZookeeperClient(zksd, ServiceDiscoveryZkClient)
+	err := zookeeper.ValidateZookeeperClient(zksd, url.Location)
 	if err != nil {
 		return nil, err
 	}