Merge pull request #8 from nacos-group/1.1

Fix alibaba/nacos#12387, avoid duplicate add ElementSelector to RuleStore.
nacos-group · Jul 22, 2024 · 92e826e · 92e826e
2 parents 32ba4c0 + 38913de
commit 92e826e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.nacos</groupId>
     <artifactId>logback-adapter</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <name>logback-adapter</name>
     <description>logback-adapter</description>
 

diff --git a/...in/java/com/alibaba/nacos/logger/adapter/logback14/NacosLogbackConfiguratorAdapterV2.java b/...in/java/com/alibaba/nacos/logger/adapter/logback14/NacosLogbackConfiguratorAdapterV2.java
@@ -59,9 +59,11 @@ protected void addModelHandlerAssociations(DefaultProcessor defaultProcessor) {
 
     @Override
     public void addElementSelectorAndActionAssociations(RuleStore ruleStore) {
-        super.addElementSelectorAndActionAssociations(ruleStore);
-        ruleStore
-                .addRule(new ElementSelector("configuration/nacosClientProperty"), NacosClientPropertyModelAction::new);
+        ElementSelector elementSelector = new ElementSelector("configuration/nacosClientProperty");
+        if (null == ruleStore.matchActions(elementSelector.duplicate())) {
+            super.addElementSelectorAndActionAssociations(ruleStore);
+            ruleStore.addRule(elementSelector, NacosClientPropertyModelAction::new);
+        }
     }
 
     /**