You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/01/24 05:27:01 UTC
logging-log4j2 git commit: [LOG4J2-2202] MarkerFilter onMismatch
invalid attribute in .properties.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 612d3f92e -> ccd745007
[LOG4J2-2202] MarkerFilter onMismatch invalid attribute in .properties.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ccd74500
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ccd74500
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ccd74500
Branch: refs/heads/master
Commit: ccd7450073682ac220805c4f33888123bcd20c7c
Parents: 612d3f9
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Jan 23 22:26:50 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Jan 23 22:26:50 2018 -0700
----------------------------------------------------------------------
.../config/properties/PropertiesConfigurationBuilder.java | 5 +++--
.../apache/logging/log4j/core/filter/MarkerFilter.java | 10 +++++++---
src/changes/changes.xml | 3 +++
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ccd74500/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
index 547d77a..db44bed 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
@@ -40,6 +40,7 @@ import org.apache.logging.log4j.core.config.builder.api.LoggerComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ScriptComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ScriptFileComponentBuilder;
+import org.apache.logging.log4j.core.filter.MarkerFilter;
import org.apache.logging.log4j.core.util.Builder;
import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
@@ -229,8 +230,8 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
if (Strings.isEmpty(type)) {
throw new ConfigurationException("No type attribute provided for Appender " + key);
}
- final String onMatch = (String) properties.remove("onMatch");
- final String onMisMatch = (String) properties.remove("onMisMatch");
+ final String onMatch = (String) properties.remove(MarkerFilter.ATTR_ON_MATCH);
+ final String onMisMatch = (String) properties.remove(MarkerFilter.ATTR_ON_MISMATCH);
final FilterComponentBuilder filterBuilder = builder.newFilter(type, onMatch, onMisMatch);
return processRemainingProperties(filterBuilder, properties);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ccd74500/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
index 69b6cc8..1774544 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
@@ -36,6 +36,10 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
@PerformanceSensitive("allocation")
public final class MarkerFilter extends AbstractFilter {
+ public static final String ATTR_MARKER = "marker";
+ public static final String ATTR_ON_MATCH = "onMatch";
+ public static final String ATTR_ON_MISMATCH = "onMismatch";
+
private final String name;
private MarkerFilter(final String name, final Result onMatch, final Result onMismatch) {
@@ -153,9 +157,9 @@ public final class MarkerFilter extends AbstractFilter {
*/
@PluginFactory
public static MarkerFilter createFilter(
- @PluginAttribute("marker") final String marker,
- @PluginAttribute("onMatch") final Result match,
- @PluginAttribute("onMismatch") final Result mismatch) {
+ @PluginAttribute(ATTR_MARKER) final String marker,
+ @PluginAttribute(ATTR_ON_MATCH) final Result match,
+ @PluginAttribute(ATTR_ON_MISMATCH) final Result mismatch) {
if (marker == null) {
LOGGER.error("A marker must be provided for MarkerFilter");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ccd74500/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5878e75..c751616 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -143,6 +143,9 @@
<action issue="LOG4J2-2182" dev="ggregory" type="update" due-to="liwenxian2017, Gary Gregory">
NullPointerException at org.apache.logging.log4j.util.Activator.loadProvider(Activator.java:81) in log4j 2.10.0.
</action>
+ <action issue="LOG4J2-2202" dev="ggregory" type="update" due-to="Kilian, Gary Gregory">
+ MarkerFilter onMismatch invalid attribute in .properties.
+ </action>
<!--
<action issue="LOG4J2-2205" dev="ggregory" type="update" due-to="Björn Kautler">
New module log4j-mongodb3: Remove use of deprecated MongoDB APIs and code to the Java driver version 3 API.