Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/98cc7d27 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/98cc7d27 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/98cc7d27 Branch: refs/heads/LOG4J2-1365 Commit: 98cc7d27c6d49da3f81ae6ff8cee2f4b0a4009e5 Parents: 80a4398 3c37ca3 Author: ggregory <[email protected]> Authored: Sun Apr 17 15:27:42 2016 -0700 Committer: ggregory <[email protected]> Committed: Sun Apr 17 15:27:42 2016 -0700 ---------------------------------------------------------------------- .../ParameterizedNoReferenceMessageFactory.java | 39 ++++- log4j-core/pom.xml | 5 + .../log4j/core/appender/AsyncAppender.java | 28 +-- .../log4j/core/appender/FileManager.java | 3 +- .../core/appender/OutputStreamManager.java | 7 +- .../appender/rolling/RollingFileManager.java | 4 +- .../log4j/core/async/AsyncLoggerConfig.java | 1 + .../core/async/AsyncLoggerConfigDelegate.java | 10 ++ .../core/async/AsyncLoggerConfigDisruptor.java | 66 +++++++- .../logging/log4j/core/async/EventRoute.java | 9 +- .../log4j/core/async/RingBufferLogEvent.java | 15 +- .../core/async/ThreadNameCachingStrategy.java | 4 +- .../logging/log4j/core/config/LoggerConfig.java | 5 +- .../log4j/core/impl/MutableLogEvent.java | 46 +++-- .../core/impl/ReusableLogEventFactory.java | 34 ++-- .../log4j/core/jackson/Initializers.java | 2 +- .../core/layout/AbstractJacksonLayout.java | 17 +- .../core/layout/ByteBufferDestination.java | 8 +- .../log4j/core/layout/JacksonFactory.java | 2 +- .../layout/LockingStringBuilderEncoder.java | 3 +- .../log4j/core/layout/StringBuilderEncoder.java | 3 +- .../log4j/core/layout/TextEncoderHelper.java | 1 - .../logging/log4j/core/net/SmtpManager.java | 5 +- .../ExtendedThrowablePatternConverter.java | 5 +- .../pattern/RootThrowablePatternConverter.java | 5 +- .../logging/log4j/core/util/Constants.java | 45 ++++- .../core/GcFreeAsynchronousLoggingTest.java | 41 +++++ .../logging/log4j/core/GcFreeLoggingTest.java | 167 ------------------ .../log4j/core/GcFreeLoggingTestUtil.java | 169 +++++++++++++++++++ .../core/GcFreeMixedSyncAyncLoggingTest.java | 58 +++++++ .../core/GcFreeSynchronousLoggingTest.java | 58 +++++++ .../log4j/core/async/perftest/IdleStrategy.java | 43 +++++ .../core/async/perftest/NoOpIdleStrategy.java | 34 ++++ .../core/async/perftest/SimpleLatencyTest.java | 118 +++++++++---- .../log4j/core/impl/MutableLogEventTest.java | 86 ++++++++++ .../log4j/test/appender/ListAppender.java | 9 +- .../resources/gcFreeMixedSyncAsyncLogging.xml | 71 ++++++++ pom.xml | 5 + src/changes/changes.xml | 3 + 39 files changed, 926 insertions(+), 308 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/98cc7d27/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java ----------------------------------------------------------------------
