Merge branch 'master' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2244ea8e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2244ea8e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2244ea8e Branch: refs/heads/LOG4J-1181 Commit: 2244ea8efc46ee945943e6867ba7fb8b82afebc1 Parents: 01713a8 ee06a27 Author: Mikael Ståldal <[email protected]> Authored: Thu Nov 12 11:12:15 2015 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Thu Nov 12 11:12:15 2015 +0100 ---------------------------------------------------------------------- .../logging/log4j/core/LoggerContext.java | 4 +- .../core/appender/mom/kafka/KafkaAppender.java | 24 +- .../logging/log4j/core/async/AsyncLogger.java | 266 +++++++++++++------ .../core/async/AsyncLoggerConfigDisruptor.java | 30 +-- .../log4j/core/async/AsyncLoggerContext.java | 8 + .../log4j/core/async/AsyncLoggerDisruptor.java | 119 ++++++--- .../log4j/core/async/DaemonThreadFactory.java | 4 +- .../logging/log4j/core/async/DisruptorUtil.java | 36 ++- .../apache/logging/log4j/core/async/Info.java | 109 -------- .../async/RingBufferLogEventTranslator.java | 21 ++ .../core/async/ThreadNameCachingStrategy.java | 63 +++++ .../logging/log4j/core/impl/Log4jLogEvent.java | 3 +- log4j-core/src/site/xdoc/index.xml | 2 +- .../appender/mom/kafka/KafkaAppenderTest.java | 39 ++- .../log4j/core/async/AsyncLoggerTest.java | 18 +- .../core/async/AsyncLoggerTestNanoTime.java | 17 +- .../AsyncLoggerThreadNameStrategyTest.java | 24 +- .../src/test/resources/KafkaAppenderTest.xml | 5 + .../log4j/web/Log4jWebInitializerImpl.java | 4 + src/changes/changes.xml | 9 + src/site/xdoc/runtime-dependencies.xml | 2 +- 21 files changed, 523 insertions(+), 284 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2244ea8e/src/site/xdoc/runtime-dependencies.xml ----------------------------------------------------------------------
