diff --git a/config_center/dynamic_configuration.go b/config_center/dynamic_configuration.go index 436ac50d86ae9900bb84e082c5d3762b57836f59..8115fed8203438c9371a1b7fa20815843a2e81fd 100644 --- a/config_center/dynamic_configuration.go +++ b/config_center/dynamic_configuration.go @@ -18,9 +18,11 @@ package config_center import ( - "github.com/apache/dubbo-go/remoting" "time" ) +import ( + "github.com/apache/dubbo-go/remoting" +) ////////////////////////////////////////// // DynamicConfiguration diff --git a/config_center/zookeeper/dynamic_configuration.go b/config_center/zookeeper/dynamic_configuration.go index bd9f97785065b2f3acfb5acd484cf5c818dda7cb..c998c586fb0a22223acaee634cb5f187e04223fc 100644 --- a/config_center/zookeeper/dynamic_configuration.go +++ b/config_center/zookeeper/dynamic_configuration.go @@ -18,7 +18,6 @@ package zookeeper import ( - "github.com/apache/dubbo-go/remoting" "sync" ) import ( @@ -26,10 +25,11 @@ import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/config_center" + "github.com/apache/dubbo-go/remoting" "github.com/apache/dubbo-go/remoting/zookeeper" ) -const ZkClient = "zk config_center" +const ZK_CLIENT = "zk config_center" type ZookeeperDynamicConfiguration struct { url common.URL @@ -48,7 +48,7 @@ func NewZookeeperDynamicConfiguration(url common.URL) (config_center.DynamicConf url: url, rootPath: "/" + url.GetParam(constant.CONFIG_NAMESPACE_KEY, config_center.DEFAULT_GROUP) + "/config", } - err := zookeeper.ValidateZookeeperClient(c, zookeeper.WithZkName(ZkClient)) + err := zookeeper.ValidateZookeeperClient(c, zookeeper.WithZkName(ZK_CLIENT)) if err != nil { return nil, err } diff --git a/registry/event.go b/registry/event.go index 9d5778d9e35156b0c66910538e376b0cde4f0544..24f5b72e8b27d4dc727e72d641d8bae3e00ff165 100644 --- a/registry/event.go +++ b/registry/event.go @@ -19,13 +19,13 @@ package registry import ( "fmt" - "github.com/apache/dubbo-go/remoting" "math/rand" "time" ) import ( "github.com/apache/dubbo-go/common" + "github.com/apache/dubbo-go/remoting" ) func init() { diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go index 2cd1cfec8a38486bef72d9ac8c6df43fd7099062..4f3cf1e19ad28cb10be8adf85351c1f2eb4d4622 100644 --- a/registry/zookeeper/listener.go +++ b/registry/zookeeper/listener.go @@ -19,7 +19,6 @@ package zookeeper import ( "context" - "github.com/apache/dubbo-go/remoting" ) import ( perrors "github.com/pkg/errors" @@ -28,6 +27,7 @@ import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/registry" + "github.com/apache/dubbo-go/remoting" zk "github.com/apache/dubbo-go/remoting/zookeeper" ) diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 8f9e865d5e56905d7a26d3c3ccc645f68650b815..ff6a9939694acf89f9a4e73e9566d20d55bf9c0e 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -45,7 +45,6 @@ import ( ) const ( - defaultTimeout = int64(10e9) RegistryZkClient = "zk registry" ) diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go index 2a698884277be5cc5c80bf84516da08696d30d56..703d06f84eacef8f830a75846c6130bb36239a1e 100644 --- a/remoting/zookeeper/listener.go +++ b/remoting/zookeeper/listener.go @@ -18,7 +18,6 @@ package zookeeper import ( - "github.com/apache/dubbo-go/remoting" "path" "sync" "time" @@ -32,6 +31,7 @@ import ( import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/logger" + "github.com/apache/dubbo-go/remoting" ) type ZkEventListener struct {