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 2B23210E86 for ; Thu, 23 Jan 2014 07:25:40 +0000 (UTC) Received: (qmail 95125 invoked by uid 500); 23 Jan 2014 07:25:39 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 95006 invoked by uid 500); 23 Jan 2014 07:25: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 94996 invoked by uid 99); 23 Jan 2014 07:25:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jan 2014 07:25:33 +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, 23 Jan 2014 07:25:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2447C238899C; Thu, 23 Jan 2014 07:25:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1560602 [2/2] - in /logging/log4j/log4j2/trunk: log4j-api/src/main/java/org/apache/logging/log4j/ log4j-api/src/main/java/org/apache/logging/log4j/spi/ log4j-api/src/main/java/org/apache/logging/log4j/status/ log4j-api/src/test/java/org/ap... Date: Thu, 23 Jan 2014 07:25:08 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140123072509.2447C238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java?rev=1560602&r1=1560601&r2=1560602&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java (original) +++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java Thu Jan 23 07:25:07 2014 @@ -57,24 +57,27 @@ public class SLF4JLogger extends Abstrac data.getParameters(), t); } else { switch (level) { - case DEBUG : - logger.debug(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); - break; - case TRACE : - logger.trace(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); - break; - case INFO : - logger.info(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); - break; - case WARN : - logger.warn(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); - break; - case ERROR : - logger.error(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); - break; - default : - logger.error(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); - break; + case TRACE: + logger.trace(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); + break; + case VERBOSE: + case DEBUG: + case DIAG: + logger.debug(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); + break; + case INFO: + case NOTICE: + logger.info(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); + break; + case WARN: + logger.warn(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); + break; + case ERROR: + logger.error(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); + break; + default: + logger.error(getMarker(marker), data.getFormattedMessage(), data.getParameters(), t); + break; } } } @@ -94,18 +97,21 @@ public class SLF4JLogger extends Abstrac private int convertLevel(final Level level) { switch (level) { - case DEBUG : - return LocationAwareLogger.DEBUG_INT; - case TRACE : - return LocationAwareLogger.TRACE_INT; - case INFO : - return LocationAwareLogger.INFO_INT; - case WARN : - return LocationAwareLogger.WARN_INT; - case ERROR : - return LocationAwareLogger.ERROR_INT; - default : - return LocationAwareLogger.ERROR_INT; + case TRACE: + return LocationAwareLogger.TRACE_INT; + case VERBOSE: + case DEBUG: + case DIAG: + return LocationAwareLogger.DEBUG_INT; + case INFO: + case NOTICE: + return LocationAwareLogger.INFO_INT; + case WARN: + return LocationAwareLogger.WARN_INT; + case ERROR: + return LocationAwareLogger.ERROR_INT; + default: + return LocationAwareLogger.ERROR_INT; } } @@ -137,19 +143,21 @@ public class SLF4JLogger extends Abstrac private boolean isEnabledFor(final Level level, final Marker marker) { final org.slf4j.Marker slf4jMarker = getMarker(marker); switch (level) { - case DEBUG : - return logger.isDebugEnabled(slf4jMarker); - case TRACE : - return logger.isTraceEnabled(slf4jMarker); - case INFO : - return logger.isInfoEnabled(slf4jMarker); - case WARN : - return logger.isWarnEnabled(slf4jMarker); - case ERROR : - return logger.isErrorEnabled(slf4jMarker); - default : - return logger.isErrorEnabled(slf4jMarker); - + case TRACE: + return logger.isTraceEnabled(slf4jMarker); + case VERBOSE: + case DEBUG: + case DIAG: + return logger.isDebugEnabled(slf4jMarker); + case INFO: + case NOTICE: + return logger.isInfoEnabled(slf4jMarker); + case WARN: + return logger.isWarnEnabled(slf4jMarker); + case ERROR: + return logger.isErrorEnabled(slf4jMarker); + default: + return logger.isErrorEnabled(slf4jMarker); } }