Repository: logging-log4j2 Updated Branches: refs/heads/master 10076a396 -> 3951869bd
[LOG4J2-1258] Async DynamicThresholdFilter does not use the log event's context map. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3951869b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3951869b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3951869b Branch: refs/heads/master Commit: 3951869bd57a1051c673b2cc81a76c52a008fbec Parents: 10076a3 Author: ggregory <[email protected]> Authored: Tue Jan 19 13:31:38 2016 -0800 Committer: ggregory <[email protected]> Committed: Tue Jan 19 13:31:38 2016 -0800 ---------------------------------------------------------------------- .../log4j/core/filter/DynamicThresholdFilter.java | 12 ++++++------ src/changes/changes.xml | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3951869b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java index 03edbdc..7e32d20 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java @@ -115,8 +115,8 @@ public final class DynamicThresholdFilter extends AbstractFilter { return true; } - private Result filter(final Level level) { - final Object value = ThreadContext.get(key); + private Result filter(final Level level, Map<String, String> contextMap) { + final Object value = contextMap.get(key); if (value != null) { Level ctxLevel = levelMap.get(value); if (ctxLevel == null) { @@ -130,25 +130,25 @@ public final class DynamicThresholdFilter extends AbstractFilter { @Override public Result filter(final LogEvent event) { - return filter(event.getLevel()); + return filter(event.getLevel(), event.getContextMap()); } @Override public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg, final Throwable t) { - return filter(level); + return filter(level, ThreadContext.getContext()); } @Override public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg, final Throwable t) { - return filter(level); + return filter(level, ThreadContext.getContext()); } @Override public Result filter(final Logger logger, final Level level, final Marker marker, final String msg, final Object... params) { - return filter(level); + return filter(level, ThreadContext.getContext()); } public String getKey() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3951869b/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 81ce277..7650945 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -44,6 +44,9 @@ <action issue="LOG4J2-1192" dev="ggregory" type="add" due-to="Jörg Bretschneider, Gary Gregory"> Dynamic Subject for SMTP Appender. </action> + <action issue="LOG4J2-1258" dev="ggregory" type="fix" due-to="Francis Lalonde"> + Async DynamicThresholdFilter does not use the log event's context map. + </action> <action issue="LOG4J2-1232" dev="ggregory" type="fix" due-to="Nikolai"> Incorrect log rotation in last week of year. </action>
