Merge remote-tracking branch 'origin/master' into LOG4J2-435-delete-on-rollover
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b58f628b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b58f628b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b58f628b Branch: refs/heads/master Commit: b58f628ba42d3bce8c8354fb13e203990780698d Parents: 11e9a27 d39f80c Author: rpopma <[email protected]> Authored: Sun Nov 29 00:15:12 2015 +0900 Committer: rpopma <[email protected]> Committed: Sun Nov 29 00:15:12 2015 +0900 ---------------------------------------------------------------------- .../core/appender/routing/IdlePurgePolicy.java | 141 +++++++++++++++++++ .../core/appender/routing/PurgePolicy.java | 31 ++++ .../core/appender/routing/RoutingAppender.java | 32 ++++- .../core/config/ConfigurationScheduler.java | 4 + .../appender/mom/kafka/KafkaAppenderTest.java | 2 +- .../routing/RoutingAppenderWithPurgingTest.java | 108 ++++++++++++++ .../log4j/core/util/WatchManagerTest.java | 2 +- .../src/test/resources/log4j-routing-purge.xml | 71 ++++++++++ pom.xml | 2 +- src/changes/changes.xml | 6 + src/site/xdoc/manual/appenders.xml | 8 ++ 11 files changed, 401 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b58f628b/src/site/xdoc/manual/appenders.xml ----------------------------------------------------------------------
