Merge branch 'master' into LOG4J2-1748and1780-remove-ExecutorService-from-LoggerContext
# Conflicts: # log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java # src/changes/changes.xml Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bd649ed9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bd649ed9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bd649ed9 Branch: refs/heads/LOG4J2-1748and1780-remove-ExecutorService-from-LoggerContext Commit: bd649ed99069add1a2b46b9e8e1079803d9507ad Parents: d3e0425 a840a4f Author: Mikael Ståldal <[email protected]> Authored: Sun Jan 15 15:51:17 2017 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Sun Jan 15 15:51:17 2017 +0100 ---------------------------------------------------------------------- log4j-core/pom.xml | 5 +- .../core/config/ConfigurationScheduler.java | 11 +- log4j-perf/pom.xml | 1 + pom.xml | 4 +- src/changes/changes.xml | 8 +- src/site/xdoc/articles.xml | 115 ++++++++++++++++++- src/site/xdoc/manual/configuration.xml.vm | 4 +- src/site/xdoc/manual/layouts.xml.vm | 18 +-- 8 files changed, 145 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bd649ed9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bd649ed9/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index a2e512a,a9d16c1..10d15f0 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -24,9 -24,9 +24,12 @@@ </properties> <body> <release version="2.8" date="2017-MM-DD" description="GA Release 2.8"> + <action issue="LOG4J2-1780" dev="mikes" type="fix"> + Eliminate the use of the ExecutorServices in the LoggerContext. + </action> + <action issue="LOG4J2-1786" dev="rpopma" type="fix"> + ConfigurationScheduler now preserves interrupt flag during stop. + </action> <action issue="LOG4J2-1243" dev="rgoers" type="add"> Allow default value in property to be a Lookup. </action> @@@ -48,8 -48,8 +51,8 @@@ <action issue="LOG4J2-1653" dev="rgoers" type="fix" due-to=" Georg Friedrich"> CronTriggeringPolicy would use the wrong date/time when rolling over and create multiple triggering policies on reconfiguration. </action> - <action issue="LOG4J2-1748" dev="rpopma" type="fix"> - Shortened the default keep-alive time for non-daemon threads from 60 seconds to 1 second to allow applications to exit promptly immediately after file rollover. + <action issue="LOG4J2-1748" dev="mikes" type="fix"> - Use ConfigurationScheduler for rollover tasks. ++ Do not use non-daemon pool for rollover tasks. </action> <action issue="LOG4J2-1628" dev="rpopma" type="fix"> Fixed file locking regression in FileAppender introduced in 2.6. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bd649ed9/src/site/xdoc/manual/configuration.xml.vm ---------------------------------------------------------------------- diff --cc src/site/xdoc/manual/configuration.xml.vm index ea45af7,b8b98a7..35b43ee --- a/src/site/xdoc/manual/configuration.xml.vm +++ b/src/site/xdoc/manual/configuration.xml.vm @@@ -410,12 -410,14 +410,14 @@@ public class Bar <tr> <td>shutdownTimeout</td> <td>Specifies how many milliseconds appenders and background tasks will get to shutdown when the JVM shuts - down. Default is zero which mean that each appender uses its default timeout, and don't wait for background - tasks. Not all appenders will honor this, it is a hint and not an absolute guarantee that the shutdown + down. Default is zero which mean that each appender uses its default timeout, and wait for background + tasks for one second. Not all appenders will honor this, it is a hint and not an absolute guarantee that the shutdown procedure will not take longer. Setting this too low increase the risk of losing outstanding log events not yet written to the final destination. See <a class="javadoc" - href="../log4j-core/target/site/apidocs/org/apache/logging/log4j/core/LoggerContext.html#stop(long, java.util.concurrent.TimeUnit)">LoggerContext.stop(long, java.util.concurrent.TimeUnit)</a>. + href="../log4j-core/target/site/apidocs/org/apache/logging/log4j/core/LoggerContext.html${esc.hash}stop(long, java.util.concurrent.TimeUnit)">LoggerContext.stop(long, + java.util.concurrent.TimeUnit)</a>. (Not used if <tt>shutdownHook</tt> is set to "disable".)</td> + </tr> <tr> <td>status</td> <td>The level of internal Log4j events that should be logged to the console.
