Repository: logging-log4j2 Updated Branches: refs/heads/master bbaacd281 -> 1e93af866
[LOG4J2-1259] Log4j threads are leaking on tomcat shutdown. Implement CompositeTriggeringPolicy.stop(long, TimeUnit). Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1e93af86 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1e93af86 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1e93af86 Branch: refs/heads/master Commit: 1e93af8661e072297b174713b900046213b24c0b Parents: bbaacd2 Author: Gary Gregory <[email protected]> Authored: Thu Sep 8 00:05:11 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Sep 8 00:05:11 2016 -0700 ---------------------------------------------------------------------- .../core/appender/rolling/CompositeTriggeringPolicy.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1e93af86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java index 46994f1..607b176 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java @@ -17,8 +17,8 @@ package org.apache.logging.log4j.core.appender.rolling; import java.util.Arrays; +import java.util.concurrent.TimeUnit; -import org.apache.logging.log4j.core.AbstractLifeCycle; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginElement; @@ -78,6 +78,15 @@ public final class CompositeTriggeringPolicy extends AbstractTriggeringPolicy { } @Override + public boolean stop(final long timeout, final TimeUnit timeUnit) { + boolean stopped = true; + for (final TriggeringPolicy policy : triggeringPolicy) { + stopped &= policy.stop(timeout, timeUnit); + } + return stopped; + } + + @Override public String toString() { return "CompositeTriggeringPolicy(policies=" + Arrays.toString(triggeringPolicy) + ")"; }
