From 90851881cc7e7eb863942b01249b32611e12557c Mon Sep 17 00:00:00 2001 From: cruel Date: Wed, 20 Nov 2024 20:39:05 +0800 Subject: [PATCH] fix(registry/zookeeper): watch service name path error with extra suffix `-` (#3948) --- contrib/registry/zookeeper/zookeeper_registrar.go | 2 +- contrib/registry/zookeeper/zookeeper_watcher.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/registry/zookeeper/zookeeper_registrar.go b/contrib/registry/zookeeper/zookeeper_registrar.go index 5b8a01817..26273a5b2 100644 --- a/contrib/registry/zookeeper/zookeeper_registrar.go +++ b/contrib/registry/zookeeper/zookeeper_registrar.go @@ -65,7 +65,7 @@ func (r *Registry) Register(_ context.Context, service gsvc.Service) (gsvc.Servi // Deregister off-lines and removes `service` from the Registry. func (r *Registry) Deregister(ctx context.Context, service gsvc.Service) error { ch := make(chan error, 1) - prefix := strings.TrimPrefix(strings.ReplaceAll(service.GetPrefix(), "/", "-"), "-") + prefix := strings.Trim(strings.ReplaceAll(service.GetPrefix(), "/", "-"), "-") servicePath := path.Join(r.opts.namespace, prefix, service.GetName()) go func() { err := r.conn.Delete(servicePath, -1) diff --git a/contrib/registry/zookeeper/zookeeper_watcher.go b/contrib/registry/zookeeper/zookeeper_watcher.go index def4fa818..1ee710a17 100644 --- a/contrib/registry/zookeeper/zookeeper_watcher.go +++ b/contrib/registry/zookeeper/zookeeper_watcher.go @@ -66,7 +66,7 @@ func (w *watcher) Proceed() ([]gsvc.Service, error) { } func (w *watcher) getServicesByPrefix() ([]gsvc.Service, error) { - prefix := strings.TrimPrefix(strings.ReplaceAll(w.prefix, "/", "-"), "-") + prefix := strings.Trim(strings.ReplaceAll(w.prefix, "/", "-"), "-") serviceNamePath := path.Join(w.nameSpace, prefix) instances, err, _ := w.group.Do(serviceNamePath, func() (interface{}, error) { servicesID, _, err := w.conn.Children(serviceNamePath) @@ -122,7 +122,7 @@ func (w *watcher) Close() error { } func (w *watcher) watch(ctx context.Context) { - prefix := strings.TrimPrefix(strings.ReplaceAll(w.prefix, "/", "-"), "-") + prefix := strings.Trim(strings.ReplaceAll(w.prefix, "/", "-"), "-") serviceNamePath := path.Join(w.nameSpace, prefix) for {