You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/07/30 02:16:53 UTC

[dubbo] branch 3.0 updated: change mesh rule group to config default value (#8330)

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new a40a909  change mesh rule group to config default value (#8330)
a40a909 is described below

commit a40a90928c9b89f243a2f5c1110d9de72b8ac1aa
Author: haoyann <10...@qq.com>
AuthorDate: Fri Jul 30 10:16:17 2021 +0800

    change mesh rule group to config default value (#8330)
---
 .../apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java
index 2b48943..3be0972 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java
@@ -31,7 +31,6 @@ public final class MeshRuleManager {
     public static final Logger logger = LoggerFactory.getLogger(MeshRuleManager.class);
 
     private static final String MESH_RULE_DATA_ID_SUFFIX = ".MESHAPPRULE";
-    private static final String GROUP = "DEFAULT_GROUP";
 
     private static final ConcurrentHashMap<String, MeshAppRuleListener> APP_RULE_LISTENERS = new ConcurrentHashMap<>();
 
@@ -48,7 +47,7 @@ public final class MeshRuleManager {
         }
 
         try {
-            String rawConfig = configuration.getConfig(appRuleDataId, GROUP, 5000L);
+            String rawConfig = configuration.getConfig(appRuleDataId, DynamicConfiguration.DEFAULT_GROUP, 5000L);
             if (rawConfig != null) {
                 meshAppRuleListener.receiveConfigInfo(rawConfig);
             }
@@ -56,7 +55,7 @@ public final class MeshRuleManager {
             logger.error("get MeshRuleManager app rule failed.", throwable);
         }
 
-        configuration.addListener(appRuleDataId, GROUP, meshAppRuleListener);
+        configuration.addListener(appRuleDataId, DynamicConfiguration.DEFAULT_GROUP, meshAppRuleListener);
         APP_RULE_LISTENERS.put(app, meshAppRuleListener);
     }