Repository: logging-log4j2 Updated Branches: refs/heads/master 52e769f8a -> 1a19f75dc
LOG4J2-1414 Fixed minor issues with the 2.6.1 web site. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1a19f75d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1a19f75d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1a19f75d Branch: refs/heads/master Commit: 1a19f75dc2dafdefe5b848d63f759a5e90145ac4 Parents: 52e769f Author: rpopma <rpo...@apache.org> Authored: Sun Jun 19 13:29:18 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Sun Jun 19 13:29:18 2016 +0900 ---------------------------------------------------------------------- src/changes/changes.xml | 3 +++ src/site/xdoc/manual/messages.xml | 24 ++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1a19f75d/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7f5eeaa..a91eab4 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -24,6 +24,9 @@ </properties> <body> <release version="2.6.2" date="2016-MM-DD" description="GA Release 2.6.2"> + <action issue="LOG4J2-1414" dev="rpopma" type="fix" due-to="Ralph Goers"> + Fixed minor issues with the 2.6.1 web site. + </action> <action issue="LOG4J2-1434" dev="rpopma" type="fix" due-to="Luke Butters"> Ensure that the thread-local StringBuilders used by Layouts to format log events to text will not retain excessive memory after a large message was logged. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1a19f75d/src/site/xdoc/manual/messages.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/messages.xml b/src/site/xdoc/manual/messages.xml index bdf3b61..84a6622 100644 --- a/src/site/xdoc/manual/messages.xml +++ b/src/site/xdoc/manual/messages.xml @@ -223,7 +223,8 @@ public class MyApp { <h4>ObjectMessage</h4> <a name="ObjectMessage"/> <p> - Formats an Object by calling its toString method. + Formats an Object by calling its toString method. Since Log4j 2.6, Layouts trying to be low-garbage or + garbage-free will call the <tt>formatTo(StringBuilder)</tt> method instead. </p> <h4>ParameterizedMessage</h4> <a name="ParameterizedMessage"/> @@ -232,10 +233,29 @@ public class MyApp { handles messages that contain "{}" in the format to represent replaceable tokens and the replacement parameters. </p> + <h4>ReusableObjectMessage</h4> + <a name="ReusableObjectMessage"/> + <p> + In garbage-free mode, this message is used to pass logged Objects to the Layout and Appenders. + Functionally equivalent to <a href="#ObjectMessage">ObjectMessage</a>. + </p> + <h4>ReusableObjectMessage</h4> + <a name="ReusableParameterizedMessage"/> + <p> + In garbage-free mode, this message is used to handle messages that contain "{}" in the format to + represent replaceable tokens and the replacement parameters. + Functionally equivalent to <a href="#ParameterizedMessage">ParameterizedMessage</a>. + </p> + <h4>ReusableSimpleMessage</h4> + <a name="ReusableSimpleMessage"/> + <p> + In garbage-free mode, this message is used to pass logged Strings and CharSequences to the Layout and Appenders. + Functionally equivalent to <a href="#SimpleMessage">SimpleMessage</a>. + </p> <h4>SimpleMessage</h4> <a name="SimpleMessage"/> <p> - SimpleMessage contains a String that requires no formatting. + SimpleMessage contains a String or CharSequence that requires no formatting. </p> <h4>StringFormattedMessage</h4> <a name="StringFormattedMessage"/>
