You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/20 02:04:42 UTC
[8/8] logging-log4j2 git commit: merge master into this branch
merge master into this branch
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/917afad5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/917afad5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/917afad5
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 917afad567fba5f14de59e4118714b13ca250295
Parents: b842432 921b330
Author: rpopma <rp...@apache.org>
Authored: Sat Aug 20 11:04:15 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Aug 20 11:04:15 2016 +0900
----------------------------------------------------------------------
.../log4j/core/appender/FileAppender.java | 12 +-
.../log4j/core/appender/FileManager.java | 36 +-
.../core/appender/OutputStreamManager.java | 18 +-
.../core/appender/RollingFileAppender.java | 372 ++++++++++++-------
.../appender/rolling/RollingFileManager.java | 50 ++-
.../log4j/core/async/DaemonThreadFactory.java | 6 +-
.../log4j/core/async/RingBufferLogEvent.java | 4 +-
.../log4j/core/appender/FileAppenderTest.java | 48 +--
.../rolling/OnStartupTriggeringPolicyTest.java | 10 +-
.../rolling/RollingAppenderSizeTest.java | 43 ++-
.../rolling/RollingFileAppenderAccessTest.java | 61 +--
.../test/resources/log4j-rolling-7z-lazy.xml | 59 +++
.../test/resources/log4j-rolling-bzip2-lazy.xml | 60 +++
.../resources/log4j-rolling-deflate-lazy.xml | 60 +++
.../test/resources/log4j-rolling-gz-lazy.xml | 59 +++
.../resources/log4j-rolling-pack200-lazy.xml | 60 +++
.../test/resources/log4j-rolling-xz-lazy.xml | 60 +++
.../test/resources/log4j-rolling-zip-lazy.xml | 60 +++
src/changes/changes.xml | 9 +-
19 files changed, 842 insertions(+), 245 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/917afad5/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------