diff --git a/cluster/router/uniform/k8s_api/k8s.go b/cluster/router/uniform/k8s_api/k8s.go index 5e45ea623b717d62d42dcbf3c1caa5ee512cdce4..8942b918ea81b37d0312d777882e1bdd5dbda002 100644 --- a/cluster/router/uniform/k8s_api/k8s.go +++ b/cluster/router/uniform/k8s_api/k8s.go @@ -5,9 +5,11 @@ import ( "github.com/apache/dubbo-go/remoting/k8sCRD" ) -const GroupName = "service.dubbo.apache.org" -const GroupVersion = "v1alpha1" -const Namespace = "dubbo-workplace" +const ( + GroupName = "service.dubbo.apache.org" + GroupVersion = "v1alpha1" + Namespace = "dubbo-workplace" +) func SetK8sEventListener(listener config_center.ConfigurationListener) error { vsUniformRouterListenerHandler := newVirtualServiceListenerHandler(listener) diff --git a/cluster/router/uniform/router_chain.go b/cluster/router/uniform/router_chain.go index 025ec2c69fb6f3835955b524a7f7539131292726..054bf9663cfb21436d97d04e2ff8c824c3bc3751 100644 --- a/cluster/router/uniform/router_chain.go +++ b/cluster/router/uniform/router_chain.go @@ -31,7 +31,7 @@ func NewUniformRouterChain(virtualServiceConfig, destinationRuleConfig []byte, n uniformRouters, err = parseFromConfigToRouters(virtualServiceConfig, destinationRuleConfig, notify) if err != nil { fromFileConfig = false - logger.Info("parse router config form local file failed") + logger.Warnf("parse router config form local file failed, error = %+v", err) } r := &RouterChain{ virtualServiceConfigBytes: virtualServiceConfig, @@ -40,7 +40,7 @@ func NewUniformRouterChain(virtualServiceConfig, destinationRuleConfig []byte, n notify: notify, } if err := k8s_api.SetK8sEventListener(r); err != nil { - logger.Info("try listen K8s router config failed") + logger.Warnf("try listen K8s router config failed, error = %+v", err) if !fromFileConfig { return nil, perrors.New("No config file from both local file and k8s") } diff --git a/cluster/router/uniform/uniform_rule.go b/cluster/router/uniform/uniform_rule.go index 89e11fd9c65a31bb2c35c51a657ea62536c50732..cd0667f5b40bf45dc22bcd61c286654a7757d8a3 100644 --- a/cluster/router/uniform/uniform_rule.go +++ b/cluster/router/uniform/uniform_rule.go @@ -176,7 +176,7 @@ func newUniformRule(dubboRoute *config.DubboRoute, destinationMap map[string]map } func (u *UniformRule) route(invokers []protocol.Invoker, url *common.URL, invocation protocol.Invocation) []protocol.Invoker { - // servicerule + destination -> filter + // service rule + destination -> filter resultInvokers := make([]protocol.Invoker, 0) matchService := false for _, v := range u.services { @@ -188,7 +188,7 @@ func (u *UniformRule) route(invokers []protocol.Invoker, url *common.URL, invoca if !matchService { return resultInvokers } - // routeDeatail level match + // route Details level match for _, rule := range u.virtualServiceRules { if rule.match(url, invocation) { resultInvokers, err := rule.getRuleTargetInvokers(invokers)