fix router rule log error

apache · Jul 29, 2024 · 820a7e2 · 820a7e2
1 parent ee3d011
commit 820a7e2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/cluster/router/condition/dynamic_router.go b/cluster/router/condition/dynamic_router.go
@@ -308,6 +308,10 @@ func (s *ServiceRouter) Notify(invokers []protocol.Invoker) {
 		logger.Errorf("Failed to query condition rule, key=%s, err=%v", key, err)
 		return
 	}
+	if value == "" {
+		logger.Infof("Condition rule is empty, key=%s", key)
+		return
+	}
 	s.Process(&config_center.ConfigChangeEvent{Key: key, Value: value, ConfigType: remoting.EventTypeAdd})
 }
 
@@ -370,6 +374,10 @@ func (a *ApplicationRouter) Notify(invokers []protocol.Invoker) {
 			logger.Errorf("Failed to query condition rule, key=%s, err=%v", key, err)
 			return
 		}
+		if value == "" {
+			logger.Infof("Condition rule is empty, key=%s", key)
+			return
+		}
 		a.Process(&config_center.ConfigChangeEvent{Key: key, Value: value, ConfigType: remoting.EventTypeUpdate})
 	}
 }

diff --git a/cluster/router/condition/factory.go b/cluster/router/condition/factory.go
@@ -19,12 +19,13 @@ package condition
 
 import (
 	"dubbo.apache.org/dubbo-go/v3/cluster/router"
+	"dubbo.apache.org/dubbo-go/v3/common/constant"
+	"dubbo.apache.org/dubbo-go/v3/common/extension"
 )
 
 func init() {
-	// TODO(finalt) Temporarily removed until fixed
-	//extension.SetRouterFactory(constant.ConditionServiceRouterFactoryKey, NewServiceConditionRouterFactory)
-	//extension.SetRouterFactory(constant.ConditionAppRouterFactoryKey, NewAppConditionRouterFactory)
+	extension.SetRouterFactory(constant.ConditionServiceRouterFactoryKey, NewServiceConditionRouterFactory)
+	extension.SetRouterFactory(constant.ConditionAppRouterFactoryKey, NewAppConditionRouterFactory)
 }
 
 // ServiceRouteFactory router factory

diff --git a/cluster/router/tag/factory.go b/cluster/router/tag/factory.go
@@ -19,6 +19,8 @@ package tag
 
 import (
 	"dubbo.apache.org/dubbo-go/v3/cluster/router"
+	"dubbo.apache.org/dubbo-go/v3/common/constant"
+	"dubbo.apache.org/dubbo-go/v3/common/extension"
 )
 
 func init() {
@@ -27,8 +29,7 @@ func init() {
 		and cause warning if config center is empty.
 		User can import this package and config config center to use tag router.
 	*/
-	// TODO(finalt) Temporarily removed until fixed
-	//extension.SetRouterFactory(constant.TagRouterFactoryKey, NewTagRouterFactory)
+	extension.SetRouterFactory(constant.TagRouterFactoryKey, NewTagRouterFactory)
 }
 
 // RouteFactory router factory

diff --git a/cluster/router/tag/router.go b/cluster/router/tag/router.go
@@ -94,6 +94,10 @@ func (p *PriorityRouter) Notify(invokers []protocol.Invoker) {
 		logger.Errorf("query router rule fail,key=%s,err=%v", key, err)
 		return
 	}
+	if value == "" {
+		logger.Infof("router rule is empty,key=%s", key)
+		return
+	}
 	p.Process(&config_center.ConfigChangeEvent{Key: key, Value: value, ConfigType: remoting.EventTypeAdd})
 }