Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E5F16D4AF for ; Thu, 1 Nov 2012 16:04:37 +0000 (UTC) Received: (qmail 98631 invoked by uid 500); 1 Nov 2012 16:04:37 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 98571 invoked by uid 500); 1 Nov 2012 16:04:35 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 98544 invoked by uid 99); 1 Nov 2012 16:04:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2012 16:04:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2012 16:04:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E141523888CD; Thu, 1 Nov 2012 16:03:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1404652 - /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java Date: Thu, 01 Nov 2012 16:03:47 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121101160347.E141523888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Thu Nov 1 16:03:47 2012 New Revision: 1404652 URL: http://svn.apache.org/viewvc?rev=1404652&view=rev Log: Allow custom ANSI mappings for Levels. Fix NPE. Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java?rev=1404652&r1=1404651&r2=1404652&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java Thu Nov 1 16:03:47 2012 @@ -51,22 +51,25 @@ import org.apache.logging.log4j.core.lay @ConverterKeys({ "highlight" }) public final class HighlightConverter extends LogEventPatternConverter { - private static final String[] DEFAULT_FATAL = new String[] { "BLINK", "BRIGHT", "RED" }; - private static final String[] DEFAULT_ERROR = new String[] { "BRIGHT", "RED" }; - private static final String[] DEFAULT_WARN = new String[] { "RED" }; - private static final String[] DEFAULT_INFO = new String[] { "BLUE" }; - private static final String[] DEFAULT_DEBUG = null; - private static final String[] DEFAULT_TRACE = null; - - private static final EnumMap LEVEL_STYLES_DEFAULT = new EnumMap(Level.class); + private static final EnumMap DEFAULT_STYLES = new EnumMap(Level.class); + + private static final EnumMap LOGBACK_STYLES = new EnumMap(Level.class); static { - LEVEL_STYLES_DEFAULT.put(Level.FATAL, AnsiEscape.createSequence(DEFAULT_FATAL)); - LEVEL_STYLES_DEFAULT.put(Level.ERROR, AnsiEscape.createSequence(DEFAULT_ERROR)); - LEVEL_STYLES_DEFAULT.put(Level.WARN, AnsiEscape.createSequence(DEFAULT_WARN)); - LEVEL_STYLES_DEFAULT.put(Level.INFO, AnsiEscape.createSequence(DEFAULT_INFO)); - LEVEL_STYLES_DEFAULT.put(Level.DEBUG, AnsiEscape.createSequence(DEFAULT_DEBUG)); - LEVEL_STYLES_DEFAULT.put(Level.TRACE, AnsiEscape.createSequence(DEFAULT_TRACE)); + DEFAULT_STYLES.put(Level.FATAL, AnsiEscape.createSequence(new String[] { "BRIGHT", "RED" })); + DEFAULT_STYLES.put(Level.ERROR, AnsiEscape.createSequence(new String[] { "BRIGHT", "RED" })); + DEFAULT_STYLES.put(Level.WARN, AnsiEscape.createSequence(new String[] { "YELLOW" })); + DEFAULT_STYLES.put(Level.INFO, AnsiEscape.createSequence(new String[] { "GREEN" })); + DEFAULT_STYLES.put(Level.DEBUG, AnsiEscape.createSequence(new String[] { "CYAN" })); + DEFAULT_STYLES.put(Level.TRACE, AnsiEscape.createSequence(new String[] { "BLACK" })); + // + LOGBACK_STYLES.put(Level.FATAL, AnsiEscape.createSequence(new String[] { "BLINK", "BRIGHT", "RED" })); + LOGBACK_STYLES.put(Level.ERROR, AnsiEscape.createSequence(new String[] { "BRIGHT", "RED" })); + LOGBACK_STYLES.put(Level.WARN, AnsiEscape.createSequence(new String[] { "RED" })); + LOGBACK_STYLES.put(Level.INFO, AnsiEscape.createSequence(new String[] { "BLUE" })); + LOGBACK_STYLES.put(Level.DEBUG, AnsiEscape.createSequence(null)); + LOGBACK_STYLES.put(Level.TRACE, AnsiEscape.createSequence(null)); + } /** @@ -92,8 +95,11 @@ public final class HighlightConverter ex * @return a new map */ private static EnumMap createLevelStyleMap(final String[] options) { - Map styles = options.length < 2 ? null : AnsiEscape.createMap(options[1]); - EnumMap levelStyles = new EnumMap(LEVEL_STYLES_DEFAULT); + if (options.length < 2) { + return DEFAULT_STYLES; + } + Map styles = AnsiEscape.createMap(options[1]); + EnumMap levelStyles = new EnumMap(DEFAULT_STYLES); for (Map.Entry entry : styles.entrySet()) { final Level key = Level.valueOf(entry.getKey()); if (key == null) {