Repository: logging-log4j2 Updated Branches: refs/heads/StyledMessage 21ed8b73b -> 4e9dd33e6
Better examples and Javadocs. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4e9dd33e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4e9dd33e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4e9dd33e Branch: refs/heads/StyledMessage Commit: 4e9dd33e65fa624e678ad4f5f120a8fc897d3614 Parents: 21ed8b7 Author: Gary Gregory <ggreg...@apache.org> Authored: Mon Jun 27 23:16:26 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Mon Jun 27 23:16:26 2016 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/pattern/JAnsiMessageRenderer.java | 8 +++++++- .../log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java | 2 +- log4j-core/src/test/resources/log4j-message-styled.xml | 2 +- log4j-core/src/test/resources/log4j2-console-msg-ansi.xml | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e9dd33e/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiMessageRenderer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiMessageRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiMessageRenderer.java index 3c84976..d66b850 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiMessageRenderer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiMessageRenderer.java @@ -47,7 +47,13 @@ import org.fusesource.jansi.AnsiRenderer.Code; * You can also define style names in the configuration: * * <pre> - * %message{ansi}{WarningStyle=red,bold DataStyle=blue}%n + * %message{ansi}{WarningStyle=red,bold KeyStyle=white ValueStyle=blue}%n + * </pre> + * + * The call site can look like this: + * + * <pre> + * logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue()); * </pre> * * Note: This class originally copied and then heavily modified code from JAnsi's AnsiRenderer (which is licensed as http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e9dd33e/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java index c60f51a..536027f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java @@ -72,7 +72,7 @@ public class ConsoleAppenderJAnsiMessageMain { // JAnsi format: // logger.info("@|red Hello|@ @|cyan World|@"); for (Entry<Object, Object> entry : System.getProperties().entrySet()) { - logger.info("@|KeyStyle {}|@ = @|DataStyle {}|@", entry.getKey(), entry.getValue()); + logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue()); } } finally { Configurator.shutdown(ctx); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e9dd33e/log4j-core/src/test/resources/log4j-message-styled.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-message-styled.xml b/log4j-core/src/test/resources/log4j-message-styled.xml index 4ddfbb8..dacf6f7 100644 --- a/log4j-core/src/test/resources/log4j-message-styled.xml +++ b/log4j-core/src/test/resources/log4j-message-styled.xml @@ -20,7 +20,7 @@ <Appenders> <List name="List"> <PatternLayout> - <Pattern>%message{ansi}{WarningStyle=red,bold DataStyle=blue, KeyStyle=white}%n</Pattern> + <Pattern>%message{ansi}{WarningStyle=red,bold KeyStyle=white ValueStyle=blue}%n</Pattern> </PatternLayout> </List> </Appenders> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e9dd33e/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml b/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml index 333740a..61f76ec 100644 --- a/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml +++ b/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml @@ -19,7 +19,7 @@ <Configuration status="OFF"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%style{%d}{white} %style{[%t]} %style{%-5level:}{yellow} %style{%msg{ansi}{KeyStyle=white DataStyle=cyan,bold}%n%throwable}{green}" /> + <PatternLayout pattern="%style{%d}{white} %style{[%t]} %style{%-5level:}{yellow} %style{%msg{ansi}{KeyStyle=white ValueStyle=cyan,bold}%n%throwable}{green}" /> </Console> </Appenders> <Loggers>
