Merge branch 'master' into gelf-layout-gc-free
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/20b90093 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/20b90093 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/20b90093 Branch: refs/heads/gelf-layout-gc-free Commit: 20b90093151b0df7b405666232e0f59b7c91f450 Parents: a5b00b3 03910c6 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Tue Mar 22 11:29:38 2016 +0100 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Tue Mar 22 11:29:38 2016 +0100 ---------------------------------------------------------------------- .../org/apache/logging/log4j/LogManager.java | 4 +- .../logging/log4j/spi/AbstractLogger.java | 11 +- log4j-core/pom.xml | 6 + .../log4j/core/appender/AsyncAppender.java | 5 +- .../rolling/DefaultRolloverStrategy.java | 186 ++++++++++--------- .../log4j/core/async/AsyncEventRouter.java | 7 +- .../core/async/AsyncEventRouterFactory.java | 44 ++--- .../logging/log4j/core/async/AsyncLogger.java | 165 +++++++--------- .../log4j/core/async/AsyncLoggerConfig.java | 6 +- .../core/async/AsyncLoggerConfigDelegate.java | 2 + .../core/async/AsyncLoggerConfigDisruptor.java | 10 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 8 +- .../core/async/DefaultAsyncEventRouter.java | 5 +- .../core/async/DiscardingAsyncEventRouter.java | 35 +--- .../logging/log4j/core/async/EventRoute.java | 4 +- .../log4j/core/async/RingBufferLogEvent.java | 21 ++- .../async/RingBufferLogEventTranslator.java | 53 ++---- .../log4j/core/filter/CompositeFilter.java | 76 ++++---- .../logging/log4j/core/lookup/JndiLookup.java | 5 +- .../core/pattern/ClassNamePatternConverter.java | 2 +- .../core/pattern/LoggerPatternConverter.java | 2 +- .../log4j/core/pattern/NameAbbreviator.java | 53 +++--- .../core/pattern/NamePatternConverter.java | 7 +- .../log4j/core/util/ObjectArrayIterator.java | 179 ++++++++++++++++++ .../log4j/core/CustomLevelsWithFiltersTest.java | 8 +- .../logging/log4j/core/GcFreeLoggingTest.java | 131 +++++++++++++ .../core/async/AsyncEventRouterFactoryTest.java | 57 +----- .../core/async/DefaultAsyncEventRouterTest.java | 25 +-- .../async/DiscardingAsyncEventRouterTest.java | 79 +++----- .../log4j/core/async/perftest/SimplePerfTest.sh | 32 +++- .../log4j/core/pattern/NameAbbreviatorTest.java | 14 +- .../appender/FlumeEmbeddedAppenderTest.java | 10 +- log4j-jmx-gui/pom.xml | 4 +- pom.xml | 8 +- src/changes/changes.xml | 8 +- src/site/xdoc/manual/async.xml | 8 +- src/site/xdoc/manual/configuration.xml.vm | 28 +-- src/site/xdoc/manual/migration.xml | 24 ++- 38 files changed, 795 insertions(+), 537 deletions(-) ----------------------------------------------------------------------
