fix: fix comment
diff --git a/cluster/router/chain/chain.go b/cluster/router/chain/chain.go
index 2abce54..0216c9a 100644
--- a/cluster/router/chain/chain.go
+++ b/cluster/router/chain/chain.go
@@ -37,10 +37,6 @@
"github.com/apache/dubbo-go/protocol"
)
-const (
- timeInterval = 5 * time.Second
-)
-
var (
virtualServiceConfigByte []byte
destinationRuleConfigByte []byte
@@ -155,7 +151,7 @@
for key, routerFactory := range routerFactories {
if virtualServiceConfigByte == nil || destinationRuleConfigByte == nil {
- logger.Errorf("virtual Service Config or destinationRule Confi Byte may be empty, pls check your CONF_VIRTUAL_SERVICE_FILE_PATH and CONF_DEST_RULE_FILE_PATH env is correctly point to your yaml file\n")
+ logger.Warnf("virtual Service Config or destinationRule Confi Byte may be empty, pls check your CONF_VIRTUAL_SERVICE_FILE_PATH and CONF_DEST_RULE_FILE_PATH env is correctly point to your yaml file\n")
}
r, err := routerFactory().NewPriorityRouter(virtualServiceConfigByte, destinationRuleConfigByte, chain.notify)
if r == nil || err != nil {
diff --git a/cluster/router/uniform/factory.go b/cluster/router/uniform/factory.go
index ffce81b..9491a3e 100644
--- a/cluster/router/uniform/factory.go
+++ b/cluster/router/uniform/factory.go
@@ -31,17 +31,16 @@
extension.SetRouterFactory(constant.UniformRouterName, newUniformRouterFactory)
}
-// ConnCheckRouteFactory is the factory to create conn check router, it aims at filter ip with unhealthy status
-// the unhealthy status is storied in protocol/rpc_status.go with sync.Map
+// UniformRouteFactory is uniform router's factory
type UniformRouteFactory struct {
}
-// newConnCheckRouteFactory construct a new ConnCheckRouteFactory
+// newUniformRouterFactory construct a new ConnCheckRouteFactory
func newUniformRouterFactory() router.PriorityRouterFactory {
return &UniformRouteFactory{}
}
-// NewPriorityRouter construct a new NewConnCheckRouter via url
+// NewPriorityRouter construct a new PriorityRouter via url
func (f *UniformRouteFactory) NewPriorityRouter(vsConfigBytes, distConfigBytes []byte, notify chan struct{}) (router.PriorityRouter, error) {
return v3router.NewUniformRouterChain(vsConfigBytes, distConfigBytes, notify)
}
diff --git a/cluster/router/uniform/factory_test.go b/cluster/router/uniform/factory_test.go
index 5ea6ff2..2776de5 100644
--- a/cluster/router/uniform/factory_test.go
+++ b/cluster/router/uniform/factory_test.go
@@ -18,10 +18,13 @@
package uniform
import (
- "github.com/stretchr/testify/assert"
"testing"
)
+import (
+ "github.com/stretchr/testify/assert"
+)
+
// TestUniformRouterFacotry created a new factory that can new uniform router
func TestUniformRouterFacotry(t *testing.T) {
factory := newUniformRouterFactory()
diff --git a/common/constant/key.go b/common/constant/key.go
index 65dddc4..54b7be5 100644
--- a/common/constant/key.go
+++ b/common/constant/key.go
@@ -208,18 +208,6 @@
// Use for router module
const (
- // ConditionRouterName Specify file condition router name
- ConditionRouterName = "condition"
- // ConditionAppRouterName Specify listenable application router name
- ConditionAppRouterName = "app"
- // ListenableRouterName Specify listenable router name
- ListenableRouterName = "listenable"
- // HealthCheckRouterName Specify the name of HealthCheckRouter
- HealthCheckRouterName = "health_check"
- // LocalPriorityRouterName Specify the name of LocalPriorityRouter
- LocalPriorityRouterName = "local_priority"
- // ConnCheckRouterName Specify the name of ConnCheckRouter
- ConnCheckRouterName = "conn_check"
// UniformRouterName Specifythe name of UniformRouter
UniformRouterName = "uniform"
// TagRouterName Specify the name of TagRouter
@@ -230,12 +218,6 @@
// ConditionRouterRuleSuffix Specify condition router suffix
ConditionRouterRuleSuffix = ".condition-router"
- // Force Force key in router module
- RouterForce = "force"
- // Enabled Enabled key in router module
- RouterEnabled = "enabled"
- // Priority Priority key in router module
- RouterPriority = "priority"
// RouterScope Scope key in router module
RouterScope = "scope"
// RouterApplicationScope Scope key in router module
diff --git a/config/config_loader.go b/config/config_loader.go
index 525938e..fc61dbf 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -384,7 +384,7 @@
func initRouter() {
if uniformDestRuleConfigPath != "" && uniformVirturlServiceConfigPath != "" {
if err := RouterInit(uniformVirturlServiceConfigPath, uniformDestRuleConfigPath); err != nil {
- log.Printf("[routerConfig init] %#v", err)
+ logger.Warnf("[routerConfig init] %#v", err)
}
}
}
diff --git a/config/router_config.go b/config/router_config.go
index 6a343a0..26f3a95 100644
--- a/config/router_config.go
+++ b/config/router_config.go
@@ -19,17 +19,9 @@
import (
"github.com/apache/dubbo-go/cluster/router/chain"
- gxset "github.com/dubbogo/gost/container/set"
-)
-
-import (
- //"github.com/apache/dubbo-go/common/extension"
- //"github.com/apache/dubbo-go/common/logger"
"github.com/apache/dubbo-go/common/yaml"
)
-var routerURLSet = gxset.NewSet()
-
// LocalRouterRules defines the local router config structure
type LocalRouterRules struct {
RouterRules []interface{} `yaml:"routerRules"`
@@ -48,8 +40,3 @@
chain.SetVSAndDRConfigByte(vsBytes, drBytes)
return nil
}
-
-// GetRouterURLSet exposes the routerURLSet
-func GetRouterURLSet() *gxset.HashSet {
- return routerURLSet
-}
diff --git a/config/router_config_test.go b/config/router_config_test.go
index e388782..007a611 100644
--- a/config/router_config_test.go
+++ b/config/router_config_test.go
@@ -26,9 +26,11 @@
"github.com/stretchr/testify/assert"
)
-const testVirtualServiceYML = "testdata/router_config_virtual_service.yml"
-const testDestinationRuleYML = "testdata/router_config_dest_rule.yml"
-const errorTestDestinationRuleYML = "testdata/router_config_destination_rule_error.yml"
+const (
+ testDestinationRuleYML = "testdata/router_config_dest_rule.yml"
+ errorTestDestinationRuleYML = "testdata/router_config_destination_rule_error.yml"
+ testVirtualServiceYML = "testdata/router_config_virtual_service.yml"
+)
func TestString(t *testing.T) {
s := "a1=>a2"
diff --git a/registry/directory/directory.go b/registry/directory/directory.go
index 987fd08..7bf8f46 100644
--- a/registry/directory/directory.go
+++ b/registry/directory/directory.go
@@ -260,14 +260,6 @@
// configRouters configures dynamic routers into the router chain, but, the current impl is incorrect, see FIXME above.
func (dir *RegistryDirectory) configRouters() {
- //var urls []*common.URL
- //for _, v := range config.GetRouterURLSet().Values() {
- // urls = append(urls, v.(*common.URL))
- //}
- //
- //if len(urls) > 0 {
- // dir.SetRouters(urls)
- //}
}
// convertUrl processes override:// and router://
diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go
index aebe075..81b9ece 100644
--- a/registry/directory/directory_test.go
+++ b/registry/directory/directory_test.go
@@ -54,16 +54,6 @@
assert.Len(t, registryDirectory.cacheInvokers, 3)
}
-////Deprecated! not support delete
-//func TestSubscribe_Delete(t *testing.T) {
-// registryDirectory, mockRegistry := normalRegistryDir()
-// time.Sleep(1e9)
-// assert.Len(t, registryDirectory.cacheInvokers, 3)
-// mockRegistry.MockEvent(®istry.ServiceEvent{Action: remoting.EventTypeDel, Service: *event.NewURLWithOptions(event.WithPath("TEST0"), event.WithProtocol("dubbo"))})
-// time.Sleep(1e9)
-// assert.Len(t, registryDirectory.cacheInvokers, 2)
-//}
-
func TestSubscribe_InvalidUrl(t *testing.T) {
url, _ := common.NewURL("mock://127.0.0.1:1111")
mockRegistry, _ := registry.NewMockRegistry(&common.URL{})
