From ec066c389683cf0a75600efa6ee0b418b390cd5a Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Sun, 26 Jan 2020 18:42:20 +0800
Subject: [PATCH] fix problems
---
cluster/directory/base_directory.go | 7 -------
config/condition_router_config.go | 1 -
config/config_loader.go | 1 +
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go
index 0e79cc401..af6ee8a65 100644
--- a/cluster/directory/base_directory.go
+++ b/cluster/directory/base_directory.go
@@ -31,11 +31,8 @@ import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
- gxset "github.com/dubbogo/gost/container/set"
)
-var routerURLSet = gxset.NewSet()
-
// BaseDirectory ...
type BaseDirectory struct {
url *common.URL
@@ -53,10 +50,6 @@ func (dir *BaseDirectory) SetRouterChain(routerChain router.Chain) {
dir.routerChain = routerChain
}
-func GetRouterURLSet() *gxset.HashSet {
- return routerURLSet
-}
-
// NewBaseDirectory ...
func NewBaseDirectory(url *common.URL) BaseDirectory {
return BaseDirectory{
diff --git a/config/condition_router_config.go b/config/condition_router_config.go
index 2fb02c951..b073621fc 100644
--- a/config/condition_router_config.go
+++ b/config/condition_router_config.go
@@ -58,7 +58,6 @@ func RouterInit(confRouterFile string) error {
}
logger.Debugf("router config{%#v}\n", routerConfig)
- directory.GetRouterURLSet().Add(initRouterUrl())
return nil
}
diff --git a/config/config_loader.go b/config/config_loader.go
index 7f72ebc85..544ff4d94 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -105,6 +105,7 @@ func Load() {
ref.Refer(rpcService)
ref.Implement(rpcService)
}
+
//wait for invoker is available, if wait over default 3s, then panic
var count int
checkok := true
--
GitLab