You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/12/11 05:46:05 UTC
[1/2] logging-log4j2 git commit: [LOG4J2-2123] DefaultMergeStrategy
did not merge filters on loggers correctly
Repository: logging-log4j2
Updated Branches:
refs/heads/master 8c86b6a92 -> fe8387f74
[LOG4J2-2123] DefaultMergeStrategy did not merge filters on loggers correctly
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e937359a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e937359a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e937359a
Branch: refs/heads/master
Commit: e937359a294971ea3c26d12bfb4c9053339ba22b
Parents: 8c86b6a
Author: Jacob Tolar <jt...@yahoo-inc.com>
Authored: Tue Nov 21 12:08:59 2017 -0600
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Dec 10 22:42:52 2017 -0700
----------------------------------------------------------------------
.../log4j/core/config/composite/DefaultMergeStrategy.java | 2 ++
.../logging/log4j/core/config/CompositeConfigurationTest.java | 5 +++++
log4j-core/src/test/resources/log4j-comp-logger.json | 5 +++++
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e937359a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
index bdee311..7b9a21d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
@@ -171,6 +171,8 @@ public class DefaultMergeStrategy implements MergeStrategy {
if (!foundFilter) {
final Node childNode = new Node(loggerNode, sourceLoggerChild.getName(),
sourceLoggerChild.getType());
+ childNode.getAttributes().putAll(sourceLoggerChild.getAttributes());
+ childNode.getChildren().addAll(sourceLoggerChild.getChildren());
targetNode.getChildren().add(childNode);
}
} else {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e937359a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
index cadea6f..cb7b497 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.FileAppender;
import org.apache.logging.log4j.core.config.composite.CompositeConfiguration;
@@ -95,6 +96,10 @@ public class CompositeConfigurationTest {
appendersMap.size());
assertTrue(appendersMap.get("STDOUT") instanceof ConsoleAppender);
+ Filter loggerFilter = config.getLogger("cat1").getFilter();
+ assertTrue(loggerFilter instanceof RegexFilter);
+ assertEquals(loggerFilter.getOnMatch(), Filter.Result.DENY);
+
appendersMap = config.getLogger("cat2").getAppenders();
assertEquals("Expected 1 Appender reference for cat2 but got " + appendersMap.size(), 1,
appendersMap.size());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e937359a/log4j-core/src/test/resources/log4j-comp-logger.json
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-comp-logger.json b/log4j-core/src/test/resources/log4j-comp-logger.json
index bda5660..fc781d3 100644
--- a/log4j-core/src/test/resources/log4j-comp-logger.json
+++ b/log4j-core/src/test/resources/log4j-comp-logger.json
@@ -16,6 +16,11 @@
"additivity" : false,
"AppenderRef" : {
"ref" : "STDOUT"
+ },
+ "RegexFilter": {
+ "regex": "TEST",
+ "onMatch": "DENY",
+ "onMismatch": "ACCEPT"
}
},
{
[2/2] logging-log4j2 git commit: LOG4J2-2123 - DefaultMergeStrategy
did not merge filters on loggers correctly
Posted by rg...@apache.org.
LOG4J2-2123 - DefaultMergeStrategy did not merge filters on loggers correctly
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fe8387f7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fe8387f7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fe8387f7
Branch: refs/heads/master
Commit: fe8387f74b609dcc3e7619f0bd4a30fb9dc4a037
Parents: e937359
Author: Ralph Goers <rg...@apache.org>
Authored: Sun Dec 10 22:45:52 2017 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Dec 10 22:45:52 2017 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fe8387f7/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 56c8b74..b9d8151 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="2.10.1" date="2017-xx-xx" description="GA Release 2.10.1">
+ <action issue="LOG4J2-2123" dev="rgoers" type="fix" due-to="Jacob Tolar">
+ DefaultMergeStrategy did not merge filters on loggers correctly
+ </action>
<action issue="LOG4J2-2146" dev="rgoers" type="update">
Update version of bnd. Convert bundle plugin error to a warning.
</action>