You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/04/10 10:30:43 UTC
[3/8] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1356
Merge branch 'master' into LOG4J2-1356
Conflicts:
log4j-core/src/test/resources/gcFreeLogging.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8dc5bd46
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8dc5bd46
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8dc5bd46
Branch: refs/heads/master
Commit: 8dc5bd46fb1752e51043e33586e3a8f7f61fc235
Parents: 05e58c6 4d1d60d
Author: Mikael Ståldal <mi...@magine.com>
Authored: Fri Apr 8 12:01:25 2016 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Fri Apr 8 12:01:25 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Logger.java | 244 +++++++++++++++
.../logging/log4j/message/MessageFactory2.java | 7 +
.../log4j/message/ReusableMessageFactory.java | 7 +
.../log4j/message/ReusableSimpleMessage.java | 16 +-
.../logging/log4j/message/SimpleMessage.java | 39 ++-
.../logging/log4j/simple/SimpleLogger.java | 5 +
.../logging/log4j/spi/AbstractLogger.java | 155 +++++++++
.../logging/log4j/spi/ExtendedLogger.java | 23 ++
.../log4j/spi/ExtendedLoggerWrapper.java | 14 +
.../log4j/spi/MessageFactory2Adapter.java | 6 +
.../logging/log4j/status/StatusLogger.java | 5 +
.../logging/log4j/AbstractLoggerTest.java | 159 ++++++++++
.../apache/logging/log4j/LambdaLoggerTest.java | 5 +
.../org/apache/logging/log4j/TestLogger.java | 5 +
.../message/ReusableSimpleMessageTest.java | 8 +-
log4j-core/pom.xml | 8 +-
.../org/apache/logging/log4j/core/Logger.java | 16 +
.../appender/AbstractOutputStreamAppender.java | 50 ++-
.../log4j/core/appender/FileManager.java | 33 +-
.../core/appender/MemoryMappedFileAppender.java | 6 +-
.../core/appender/MemoryMappedFileManager.java | 57 +++-
.../core/appender/OutputStreamManager.java | 51 +++
.../OutputStreamManagerDestination.java | 59 ++++
.../core/appender/RandomAccessFileAppender.java | 13 +-
.../core/appender/RandomAccessFileManager.java | 44 ++-
.../RollingRandomAccessFileAppender.java | 13 +-
.../log4j/core/appender/SocketAppender.java | 21 +-
.../appender/rolling/RollingFileManager.java | 14 +-
.../rolling/RollingRandomAccessFileManager.java | 59 +++-
.../core/jackson/Log4jJsonObjectMapper.java | 2 +-
.../core/jackson/Log4jXmlObjectMapper.java | 2 +-
.../logging/log4j/core/util/Constants.java | 18 +-
.../logging/log4j/core/util/WatchManager.java | 6 +-
.../logging/log4j/MarkerMixInJsonTest.java | 31 ++
.../apache/logging/log4j/MarkerMixInTest.java | 8 +-
.../logging/log4j/MarkerMixInXmlTest.java | 31 ++
.../logging/log4j/core/GcFreeLoggingTest.java | 40 ++-
.../MemoryMappedFileAppenderLocationTest.java | 14 +-
.../appender/MemoryMappedFileManagerTest.java | 4 +-
.../appender/RandomAccessFileManagerTest.java | 15 +-
.../RollingRandomAccessFileManagerTest.java | 6 +-
.../log4j/core/impl/Log4jLogEventTest.java | 39 +--
.../log4j/core/impl/ThrowableProxyTest.java | 15 +-
.../log4j/core/jackson/LevelMixInJsonTest.java | 28 ++
.../log4j/core/jackson/LevelMixInTest.java | 9 +-
.../log4j/core/jackson/LevelMixInXmlTest.java | 32 ++
.../org/apache/logging/slf4j/SLF4JLogger.java | 5 +
pom.xml | 2 +-
src/changes/changes.xml | 15 +
src/site/site.xml | 19 +-
src/site/xdoc/manual/garbagefree.xml | 118 +++++--
src/site/xdoc/manual/thread-context.xml | 311 ++++++++++---------
52 files changed, 1581 insertions(+), 331 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8dc5bd46/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8dc5bd46/src/site/xdoc/manual/garbagefree.xml
----------------------------------------------------------------------
diff --cc src/site/xdoc/manual/garbagefree.xml
index 074f0d0,2338d1e..60471f5
--- a/src/site/xdoc/manual/garbagefree.xml
+++ b/src/site/xdoc/manual/garbagefree.xml
@@@ -234,11 -276,28 +281,32 @@@
</ul>
</td></tr></table>
+
+ <h5>GelfLayout</h5>
+ <p>GelfLayout is garbage-free when used with compressionType="OFF".</p>
+
</subsubsection>
+ <a name="api" />
+ <subsubsection name="API Changes">
+ <h4>API Changes</h4>
+ <p>
+ Methods have been added to the <tt>Logger</tt> interface so that no vararg array objects are created
+ when logging messages with up to ten parameters.
+ </p>
+ <p>
+ Also, methods have been added to the <tt>Logger</tt> interface to log <tt>CharSequence</tt> messages.
+ User-defined objects that implement the <tt>CharSequence</tt> interface can be logged without creating
+ temporary objects: Log4j will try to turn CharSequence messages,
+ Object messages and message parameters
+ into text by appending them to a StringBuilder as a CharSequence.
+ This avoids calling <tt>toString()</tt> on these objects.
+ </p>
+ <p>
+ (Note that Log4j may call <tt>toString()</tt> on message and parameter objects when
+ garbage-free logging is disabled
+ because system property <tt>log4j2.enable.threadlocals</tt> is set to "false".)
+ </p>
+ </subsubsection>
<a name="codeImpact" />
<subsubsection name="Impact on Application Code: Autoboxing">
<h4>Impact on Application Code: Autoboxing</h4>