Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1349-gcfree-threadcontext
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/213ad7c4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/213ad7c4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/213ad7c4 Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 213ad7c4f8efd7ce3ca89db969ef82e279818634 Parents: 7c1406c f2a07e6 Author: rpopma <[email protected]> Authored: Sat Sep 10 02:27:12 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Sep 10 02:27:12 2016 +0900 ---------------------------------------------------------------------- .../log4j/core/appender/ConsoleAppender.java | 6 +- .../rolling/CompositeTriggeringPolicy.java | 5 +- .../appender/rolling/RollingFileManager.java | 962 ++++++++++--------- .../core/appender/rolling/TriggeringPolicy.java | 3 +- .../logging/log4j/core/config/LoggerConfig.java | 40 + .../logging/log4j/core/impl/ThrowableProxy.java | 282 +++--- .../log4j/core/appender/AsyncAppenderTest.java | 21 +- .../async/AsyncLoggerClassLoadDeadlock.java | 32 + .../async/AsyncLoggerClassLoadDeadlockTest.java | 45 + .../logging/log4j/junit/LoggerContextRule.java | 11 + .../logging/log4j/test/ExtendedLevels.java | 2 +- .../log4j/test/appender/ListAppender.java | 12 + .../test/resources/AsyncLoggerConsoleTest.xml | 16 + .../src/test/resources/log4j-customLevel.xml | 7 +- src/changes/changes.xml | 6 +- 15 files changed, 799 insertions(+), 651 deletions(-) ----------------------------------------------------------------------
