Merge branch 'master' into LOG4J2-1528
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc215c76 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc215c76 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc215c76 Branch: refs/heads/LOG4J2-1528 Commit: cc215c76d41f8eeb6e8a273c16387a194b63278e Parents: 7a1cd3a 03fe13f Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sun Aug 21 10:17:23 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sun Aug 21 10:17:23 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/Logger.java | 20 + .../org/apache/logging/log4j/ThreadContext.java | 55 +-- .../log4j/spi/DefaultThreadContextMap.java | 6 +- .../logging/log4j/spi/ThreadContextMap.java | 13 +- .../logging/log4j/spi/ThreadContextMap2.java | 40 ++ .../logging/log4j/spi/ThreadContextStack.java | 1 + .../logging/log4j/core/LoggerContext.java | 1 + .../log4j/core/appender/AbstractManager.java | 2 + .../log4j/core/appender/FileAppender.java | 12 +- .../log4j/core/appender/FileManager.java | 36 +- .../core/appender/OutputStreamManager.java | 18 +- .../core/appender/RollingFileAppender.java | 372 ++++++++++++------- .../core/appender/mom/kafka/KafkaManager.java | 185 +++++---- .../appender/rolling/RollingFileManager.java | 50 ++- .../core/async/AsyncLoggerConfigDisruptor.java | 3 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 3 +- .../log4j/core/async/DaemonThreadFactory.java | 53 --- .../log4j/core/async/RingBufferLogEvent.java | 4 +- .../core/config/ConfigurationScheduler.java | 15 +- .../config/composite/DefaultMergeStrategy.java | 1 + .../apache/logging/log4j/core/jmx/Server.java | 5 +- .../log4j/core/layout/PatternLayout.java | 4 +- .../logging/log4j/core/util/Log4jThread.java | 138 +++---- .../log4j/core/util/Log4jThreadFactory.java | 88 +++++ .../log4j/core/appender/FileAppenderTest.java | 48 +-- .../rolling/OnStartupTriggeringPolicyTest.java | 10 +- .../rolling/RollingAppenderSizeTest.java | 43 ++- .../rolling/RollingFileAppenderAccessTest.java | 61 +-- .../core/async/RingBufferLogEventTest.java | 18 +- .../core/config/CompositeConfigurationTest.java | 34 +- .../log4j-comp-logger-attr-override.json | 38 ++ .../test/resources/log4j-comp-logger-root.xml | 44 +++ .../test/resources/log4j-rolling-7z-lazy.xml | 59 +++ .../test/resources/log4j-rolling-bzip2-lazy.xml | 60 +++ .../resources/log4j-rolling-deflate-lazy.xml | 60 +++ .../test/resources/log4j-rolling-gz-lazy.xml | 59 +++ .../resources/log4j-rolling-pack200-lazy.xml | 60 +++ .../test/resources/log4j-rolling-xz-lazy.xml | 60 +++ .../test/resources/log4j-rolling-zip-lazy.xml | 60 +++ .../flume/appender/FlumePersistentManager.java | 30 +- .../org/apache/logging/slf4j/MDCContextMap.java | 7 +- src/changes/changes.xml | 15 +- src/site/xdoc/manual/appenders.xml | 18 +- 43 files changed, 1354 insertions(+), 555 deletions(-) ----------------------------------------------------------------------
