blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

fix(registry/zookeeper): watch service name path error with extra suffix - (#3948)

Browse Source
This commit is contained in:
cruel 2024-11-20 20:39:05 +08:00 committed by GitHub
parent 3090fe7f4e
commit 90851881cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/registry/zookeeper/zookeeper_registrar.go
View File

@ -65,7 +65,7 @@ func (r *Registry) Register(_ context.Context, service gsvc.Service) (gsvc.Servi
// Deregister off-lines and removes `service` from the Registry. // Deregister off-lines and removes `service` from the Registry.
func (r *Registry) Deregister(ctx context.Context, service gsvc.Service) error { func (r *Registry) Deregister(ctx context.Context, service gsvc.Service) error {
ch := make(chan error, 1) 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()) servicePath := path.Join(r.opts.namespace, prefix, service.GetName())
go func() { go func() {
err := r.conn.Delete(servicePath, -1) err := r.conn.Delete(servicePath, -1)

4
contrib/registry/zookeeper/zookeeper_watcher.go
View File

@ -66,7 +66,7 @@ func (w *watcher) Proceed() ([]gsvc.Service, error) {
} }
func (w *watcher) getServicesByPrefix() ([]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) serviceNamePath := path.Join(w.nameSpace, prefix)
instances, err, _ := w.group.Do(serviceNamePath, func() (interface{}, error) { instances, err, _ := w.group.Do(serviceNamePath, func() (interface{}, error) {
servicesID, _, err := w.conn.Children(serviceNamePath) servicesID, _, err := w.conn.Children(serviceNamePath)
@ -122,7 +122,7 @@ func (w *watcher) Close() error {
} }
func (w *watcher) watch(ctx context.Context) { 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) serviceNamePath := path.Join(w.nameSpace, prefix)
for { for {