diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go index 0e79cc40112c48288c7eb549d0fc5532cf0926e6..af6ee8a6580b6f4b60868ef6a7908e2b06fb6ea4 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 2fb02c951be788e4d5a8801e0bb76eba856c9892..b073621fcdfcc619be83ad664e726dbe5c7a7a71 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 7f72ebc857602cef1af46f0ab497818d1a04992c..544ff4d94c1fce562f34593f1b970c7e1f324109 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