Repository: logging-log4j2 Updated Branches: refs/heads/master 2f3631131 -> 566449e9d
Fix JSONLayout documentation Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/566449e9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/566449e9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/566449e9 Branch: refs/heads/master Commit: 566449e9ddcf66d2b4b4e0d3f611b87dce08bb82 Parents: 2f36311 Author: Mikael Ståldal <[email protected]> Authored: Tue Feb 2 17:41:52 2016 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Tue Feb 2 17:43:16 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/layout/JsonLayout.java | 6 +++--- src/site/xdoc/manual/layouts.xml.vm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/566449e9/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java index fe1a3b4..28dd0a5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java @@ -780,8 +780,8 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; } * </pre> * <p> - * If {@code complete="false"}, the appender does not write the JSON open array character "[" at the start of the - * document. and "]" and the end. + * If {@code complete="false"}, the appender does not write the JSON open array character "[" at the start + * of the document, "]" and the end, nor comma "," between records. * </p> * <p> * This approach enforces the independence of the JsonLayout and the appender where you embed it. @@ -881,7 +881,7 @@ public final class JsonLayout extends AbstractJacksonLayout { * @param properties * If "true", includes the thread context in the generated JSON. * @param complete - * If "true", includes the JSON header and footer, defaults to "false". + * If "true", includes the JSON header and footer, and comma between records. * @param compact * If "true", does not use end-of-lines and indentation, defaults to "false". * @param eventEol http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/566449e9/src/site/xdoc/manual/layouts.xml.vm ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/layouts.xml.vm b/src/site/xdoc/manual/layouts.xml.vm index 422fa1e..03b4b05 100644 --- a/src/site/xdoc/manual/layouts.xml.vm +++ b/src/site/xdoc/manual/layouts.xml.vm @@ -288,7 +288,7 @@ logger.debug("one={}, two={}, three={}", 1, 2, 3); </pre> <p> If <code>complete="false"</code>, the appender does not write the JSON open array character "[" at the start - of the document. and "]" and the end. + of the document, "]" and the end, nor comma "," between records. </p> <p> This approach enforces the independence of the JSONLayout and the appender where you embed it. @@ -334,7 +334,7 @@ logger.debug("one={}, two={}, three={}", 1, 2, 3); <tr> <td>complete</td> <td>boolean</td> - <td>If true, the appender includes the JSON header and footer. Defaults to false.</td> + <td>If true, the appender includes the JSON header and footer, and comma between records. Defaults to false.</td> </tr> <tr> <td>properties</td>
