From e78c26d83a3cc5a1c3ef7704e87335e04d8467f1 Mon Sep 17 00:00:00 2001 From: Joe Zou Date: Sat, 31 Oct 2020 23:39:06 +0800 Subject: [PATCH] Merge pull request #819 from lin-jianjun/develop Fix: etcd registry --- registry/etcdv3/registry.go | 2 +- registry/etcdv3/service_discovery.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/registry/etcdv3/registry.go b/registry/etcdv3/registry.go index 9cbc494560..f3cc379bd8 100644 --- a/registry/etcdv3/registry.go +++ b/registry/etcdv3/registry.go @@ -91,7 +91,7 @@ func newETCDV3Registry(url *common.URL) (registry.Registry, error) { r, etcdv3.WithName(etcdv3.RegistryETCDV3Client), etcdv3.WithTimeout(timeout), - etcdv3.WithEndpoints(url.Location), + etcdv3.WithEndpoints(strings.Split(url.Location, ",")...), ); err != nil { return nil, err } diff --git a/registry/etcdv3/service_discovery.go b/registry/etcdv3/service_discovery.go index dceaa99df8..e8d4aea9a4 100644 --- a/registry/etcdv3/service_discovery.go +++ b/registry/etcdv3/service_discovery.go @@ -19,6 +19,7 @@ package etcdv3 import ( "fmt" + "strings" "sync" "time" ) @@ -313,7 +314,7 @@ func newEtcdV3ServiceDiscovery(name string) (registry.ServiceDiscovery, error) { client := etcdv3.NewServiceDiscoveryClient( etcdv3.WithName(etcdv3.RegistryETCDV3Client), etcdv3.WithTimeout(timeout), - etcdv3.WithEndpoints(remoteConfig.Address), + etcdv3.WithEndpoints(strings.Split(remoteConfig.Address, ",")...), ) descriptor := fmt.Sprintf("etcd-service-discovery[%s]", remoteConfig.Address)