Merge branch 'LOG4J2-2031-improveQueueFull-handling'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c81c118a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c81c118a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c81c118a Branch: refs/heads/master Commit: c81c118a2957cab9434ece771daef4cb8311ae63 Parents: 9662274 d8d760d Author: rpopma <[email protected]> Authored: Wed Sep 20 22:47:19 2017 +0900 Committer: rpopma <[email protected]> Committed: Wed Sep 20 22:47:19 2017 +0900 ---------------------------------------------------------------------- .../logging/log4j/spi/AbstractLogger.java | 55 ++++++++- .../log4j/core/appender/AsyncAppender.java | 15 ++- .../logging/log4j/core/async/AsyncLogger.java | 58 ++++++++- .../log4j/core/async/AsyncLoggerConfig.java | 14 +++ .../log4j/core/async/AsyncLoggerDisruptor.java | 4 +- .../core/async/AsyncQueueFullMessageUtil.java | 45 +++++++ .../core/async/DefaultAsyncQueueFullPolicy.java | 14 ++- .../log4j/core/PropertiesFileConfigTest.java | 6 +- .../log4j/core/async/BlockingAppender.java | 94 ++++++++++++++ .../async/DefaultAsyncQueueFullPolicyTest.java | 6 +- .../DiscardingAsyncQueueFullPolicyTest.java | 8 +- .../log4j/core/async/QueueFullAbstractTest.java | 121 +++++++++++++++++++ ...syncLoggerConfigLoggingFromToStringTest.java | 97 +++++++++++++++ .../async/QueueFullAsyncLoggerConfigTest.java | 91 ++++++++++++++ ...eFullAsyncLoggerLoggingFromToStringTest.java | 102 ++++++++++++++++ .../core/async/QueueFullAsyncLoggerTest.java | 97 +++++++++++++++ .../src/test/resources/log4j2-queueFull.xml | 28 +++++ .../log4j2-queueFullAsyncLoggerConfig.xml | 28 +++++ 18 files changed, 854 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
