From commits-return-1130-apmail-logging-commits-archive=logging.apache.org@logging.apache.org Mon Sep 3 00:31:03 2012 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 DBF6099AF for ; Mon, 3 Sep 2012 00:31:02 +0000 (UTC) Received: (qmail 39365 invoked by uid 500); 3 Sep 2012 00:31:02 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 39338 invoked by uid 500); 3 Sep 2012 00:31:02 -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 39331 invoked by uid 99); 3 Sep 2012 00:31:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Sep 2012 00:31:02 +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; Mon, 03 Sep 2012 00:31:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 08F6F2388900; Mon, 3 Sep 2012 00:30:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1380100 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java src/changes/changes.xml Date: Mon, 03 Sep 2012 00:30:18 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120903003019.08F6F2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Mon Sep 3 00:30:18 2012 New Revision: 1380100 URL: http://svn.apache.org/viewvc?rev=1380100&view=rev Log: Fix LOG4J2-74 - Logger.error(Marker, Message, Throwable) was internally using Level.TRACE. Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java logging/log4j/log4j2/trunk/src/changes/changes.xml Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?rev=1380100&r1=1380099&r2=1380100&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Mon Sep 3 00:30:18 2012 @@ -1147,8 +1147,8 @@ public abstract class AbstractLogger imp * @param t A Throwable or null. */ public void error(Marker marker, Message msg, Throwable t) { - if (isEnabled(Level.TRACE, marker, msg, t)) { - log(marker, FQCN, Level.TRACE, msg, t); + if (isEnabled(Level.ERROR, marker, msg, t)) { + log(marker, FQCN, Level.ERROR, msg, t); } } Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1380100&r1=1380099&r2=1380100&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/changes/changes.xml (original) +++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Sep 3 00:30:18 2012 @@ -23,6 +23,9 @@ + + Logger.error(Marker, Message, Throwable) was internally using Level.TRACE. + Enhanced Log4jContextListener to accept a configuration file location. Modified FileConfigurationMonitor to monitor files configured that way. Fixed other reconfiguration related bugs. Tested in JBoss and