From c9ed4e0c46de06f174fde369b55c69a6d3d088dc Mon Sep 17 00:00:00 2001 From: dongjianhui03 Date: Wed, 2 Mar 2022 00:03:17 +0800 Subject: [PATCH] feat(gost): upgrade gost dependency version and remove redundant code --- go.mod | 2 +- go.sum | 4 ++-- remoting/zookeeper/listener.go | 14 +------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 736db346f9..5fda5a833e 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/apache/dubbo-go-hessian2 v1.11.0 github.com/creasty/defaults v1.5.2 github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5 - github.com/dubbogo/gost v1.11.23 + github.com/dubbogo/gost v1.11.24 github.com/dubbogo/grpc-go v1.42.8 github.com/dubbogo/triple v1.1.8-rc2 github.com/emicklei/go-restful/v3 v3.7.3 diff --git a/go.sum b/go.sum index 8eb79dc840..78501200b3 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,8 @@ github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5/go.mod h1:f github.com/dubbogo/gost v1.9.0/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8= github.com/dubbogo/gost v1.11.18/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= github.com/dubbogo/gost v1.11.20/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= -github.com/dubbogo/gost v1.11.23 h1:5A7N1jJ5oApcxJwjh4FkhN9iqsx8ddFWTakwCUlNJMw= -github.com/dubbogo/gost v1.11.23/go.mod h1:PhJ8+qZJx+Txjx1KthNPuVkCvUca0jRLgKWj/noGgeI= +github.com/dubbogo/gost v1.11.24 h1:vKUYzULnsZ5RmTUOkg6k6rnmv37P9FbEgngv4Tv9bh4= +github.com/dubbogo/gost v1.11.24/go.mod h1:PhJ8+qZJx+Txjx1KthNPuVkCvUca0jRLgKWj/noGgeI= github.com/dubbogo/grpc-go v1.42.7/go.mod h1:F1T9hnUvYGW4JLK1QNriavpOkhusU677ovPzLkk6zHM= github.com/dubbogo/grpc-go v1.42.8 h1:gj36IzN75BAPvTNsmNP6irMuuavB7kGpa+/vUmyCkns= github.com/dubbogo/grpc-go v1.42.8/go.mod h1:F1T9hnUvYGW4JLK1QNriavpOkhusU677ovPzLkk6zHM= diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go index 7bf4382276..56c3ffdd97 100644 --- a/remoting/zookeeper/listener.go +++ b/remoting/zookeeper/listener.go @@ -198,19 +198,7 @@ func (l *ZkEventListener) handleZkNodeEvent(zkPath string, children []string, li newChildren, err := l.Client.GetChildren(zkPath) if err != nil { - // TODO need to ignore this error in gost - if err == gxzookeeper.ErrNilChildren { - content, _, connErr := l.Client.Conn.Get(zkPath) - if connErr != nil { - logger.Errorf("Get new node path {%v} 's content error,message is {%v}", - zkPath, perrors.WithStack(connErr)) - } else { - // TODO this if for config center listener, and will be removed when we refactor config center listener - listener.DataChange(remoting.Event{Path: zkPath, Action: remoting.EventTypeUpdate, Content: string(content)}) - } - } else { - logger.Errorf("path{%s} child nodes changed, zk.Children() = error{%v}", zkPath, perrors.WithStack(err)) - } + logger.Errorf("[ZkEventListener handleZkNodeEvent]Path{%s} child nodes changed, zk.Children() = error{%v}", zkPath, perrors.WithStack(err)) return }