Merge branch 'LOG4J2-1121B-ReliabilityStrategy' Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6f02c448 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6f02c448 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6f02c448
Branch: refs/heads/master Commit: 6f02c4487f21e25c7220f61a846cd5889e31a498 Parents: 8025bb1 a536638 Author: rpopma <[email protected]> Authored: Sun Sep 20 10:24:45 2015 +0200 Committer: rpopma <[email protected]> Committed: Sun Sep 20 10:24:45 2015 +0200 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/Logger.java | 18 ++- .../logging/log4j/core/async/AsyncLogger.java | 8 +- .../core/config/AbstractConfiguration.java | 26 ++- .../AwaitCompletionReliabilityStrategy.java | 157 +++++++++++++++++++ ...AwaitUnconditionallyReliabilityStrategy.java | 119 ++++++++++++++ .../log4j/core/config/ConfigurationMonitor.java | 9 ++ .../config/DefaultConfigurationMonitor.java | 8 + .../core/config/DefaultReliabilityStrategy.java | 103 ++++++++++++ .../core/config/FileConfigurationMonitor.java | 8 + .../core/config/LockingReliabilityStrategy.java | 128 +++++++++++++++ .../logging/log4j/core/config/LoggerConfig.java | 155 ++++++------------ .../log4j/core/config/ReliabilityStrategy.java | 76 +++++++++ .../core/config/ReliabilityStrategyFactory.java | 69 ++++++++ .../log4j/core/async/AsyncLoggerConfigTest.java | 6 +- 14 files changed, 766 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
