diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index f67f98465d840d58345755dca8552bec525be6b8..3b07648824f65bbbe8619745ab74207f7d8c301a 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -40,11 +40,6 @@ import ( "github.com/apache/dubbo-go/remoting/zookeeper" ) -const ( - // RegistryZkClient zk client name - RegistryZkClient = "zk registry" -) - func init() { extension.SetRegistry("zookeeper", newZkRegistry) } @@ -74,7 +69,7 @@ func newZkRegistry(url *common.URL) (registry.Registry, error) { } r.InitBaseRegistry(url, r) - err = zookeeper.ValidateZookeeperClient(r, RegistryZkClient) + err = zookeeper.ValidateZookeeperClient(r, url.Location) if err != nil { return nil, err } diff --git a/registry/zookeeper/service_discovery.go b/registry/zookeeper/service_discovery.go index 1b04322d7151414e5ae83229a8c3d9b65f76bc88..6562628160afbff20c7420a9b4f8159bdc806ddf 100644 --- a/registry/zookeeper/service_discovery.go +++ b/registry/zookeeper/service_discovery.go @@ -44,11 +44,6 @@ import ( "github.com/apache/dubbo-go/remoting/zookeeper/curator_discovery" ) -const ( - // RegistryZkClient zk client name - ServiceDiscoveryZkClient = "zk service discovery" -) - var ( // 16 would be enough. We won't use concurrentMap because in most cases, there are not race condition instanceMap = make(map[string]registry.ServiceDiscovery, 16) @@ -108,7 +103,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 }