January 2009 - logback-dev - mailman3.qos.ch

svn commit: r2129 - in logback/trunk: logback-examples/src/main/java/chapter2 logback-examples/src/main/java/chapter3 logback-examples/src/main/java/chapter4 logback-examples/src/main/java/chapter4/conf logback-examples/src/main/java/chapter4/db logback-examples/src/main/java/chapter4/mail logback-examples/src/main/java/chapter6 logback-examples/src/main/java/chapter7 logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 21 Jan '09

21 Jan '09

Author: ceki Date: Wed Jan 21 22:57:21 2009 New Revision: 2129 Modified: logback/trunk/logback-examples/src/main/java/chapter2/sample-config-1.xml logback/trunk/logback-examples/src/main/java/chapter2/sample-config-2.xml logback/trunk/logback-examples/src/main/java/chapter2/sample-config-3.xml logback/trunk/logback-examples/src/main/java/chapter3/additivityFlag.xml logback/trunk/logback-examples/src/main/java/chapter3/duplicate.xml logback/trunk/logback-examples/src/main/java/chapter3/restricted.xml logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-HtmlToConsole.xml logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-MDC.xml logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTP.xml logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTPWithHtml.xml logback/trunk/logback-examples/src/main/java/chapter4/countingConsole.xml logback/trunk/logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource.xml logback/trunk/logback-examples/src/main/java/chapter4/db/append-with-drivermanager.xml logback/trunk/logback-examples/src/main/java/chapter4/mail/mail2.xml logback/trunk/logback-examples/src/main/java/chapter6/FilterEvents.java logback/trunk/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml logback/trunk/logback-examples/src/main/java/chapter7/simpleMDC.xml logback/trunk/logback-site/src/site/pages/manual/filters.html logback/trunk/logback-site/src/site/pages/manual/jmxConfig.html logback/trunk/logback-site/src/site/pages/manual/joran.html logback/trunk/logback-site/src/site/pages/manual/layouts.html logback/trunk/logback-site/src/site/pages/manual/mdc.html logback/trunk/logback-site/src/site/pages/news.html Log: Adjusting all examples so that the level of a logger or root logger is declared as an attribute and not as a nested element. However, the code still honors the old covention. Modified: logback/trunk/logback-examples/src/main/java/chapter2/sample-config-1.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter2/sample-config-1.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter2/sample-config-1.xml Wed Jan 21 22:57:21 2009 @@ -9,8 +9,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter2/sample-config-2.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter2/sample-config-2.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter2/sample-config-2.xml Wed Jan 21 22:57:21 2009 @@ -17,8 +17,7 @@ <File>sample-log.txt</File> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> <appender-ref ref="FILE" /> </root> Modified: logback/trunk/logback-examples/src/main/java/chapter2/sample-config-3.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter2/sample-config-3.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter2/sample-config-3.xml Wed Jan 21 22:57:21 2009 @@ -17,12 +17,9 @@ <File>sample-log.txt</File> </appender> - <logger name="chapter2"> - <level value="info" /> - </logger> + <logger name="chapter2" level="info" /> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> <appender-ref ref="FILE" /> </root> Modified: logback/trunk/logback-examples/src/main/java/chapter3/additivityFlag.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/additivityFlag.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/additivityFlag.xml Wed Jan 21 22:57:21 2009 @@ -19,8 +19,7 @@ <appender-ref ref="FILE" /> </logger> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration> \ No newline at end of file Modified: logback/trunk/logback-examples/src/main/java/chapter3/duplicate.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/duplicate.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/duplicate.xml Wed Jan 21 22:57:21 2009 @@ -13,8 +13,7 @@ <appender-ref ref="STDOUT" /> </logger> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration> \ No newline at end of file Modified: logback/trunk/logback-examples/src/main/java/chapter3/restricted.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/restricted.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/restricted.xml Wed Jan 21 22:57:21 2009 @@ -17,8 +17,7 @@ <appender-ref ref="FILE" /> </logger> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration> \ No newline at end of file Modified: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-HtmlToConsole.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-HtmlToConsole.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-HtmlToConsole.xml Wed Jan 21 22:57:21 2009 @@ -10,8 +10,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-MDC.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-MDC.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-MDC.xml Wed Jan 21 22:57:21 2009 @@ -7,8 +7,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTP.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTP.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTP.xml Wed Jan 21 22:57:21 2009 @@ -13,8 +13,7 @@ <To>recipient_email(a)host.ch</To> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="SMTP" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTPWithHtml.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTPWithHtml.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-SMTPWithHtml.xml Wed Jan 21 22:57:21 2009 @@ -14,8 +14,7 @@ <To>recipient_email(a)host.ch</To> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="SMTP" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter4/countingConsole.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/countingConsole.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/countingConsole.xml Wed Jan 21 22:57:21 2009 @@ -10,8 +10,7 @@ <limit>5</limit> </appender> - <root> - <level value="debug"/> + <root level="debug"> <appender-ref ref="CUSTOM" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/db/append-toMySQL-with-datasource.xml Wed Jan 21 22:57:21 2009 @@ -14,8 +14,7 @@ </connectionSource> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="DB" /> </root> Modified: logback/trunk/logback-examples/src/main/java/chapter4/db/append-with-drivermanager.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/db/append-with-drivermanager.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/db/append-with-drivermanager.xml Wed Jan 21 22:57:21 2009 @@ -12,8 +12,7 @@ </connectionSource> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="DB" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter4/mail/mail2.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/mail/mail2.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/mail2.xml Wed Jan 21 22:57:21 2009 @@ -9,8 +9,7 @@ <layout class="ch.qos.logback.classic.html.HTMLLayout"/> </appender> - <root> - <level value="debug"/> + <root level="debug"> <appender-ref ref="EMAIL" /> </root> </configuration> Modified: logback/trunk/logback-examples/src/main/java/chapter6/FilterEvents.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter6/FilterEvents.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter6/FilterEvents.java Wed Jan 21 22:57:21 2009 @@ -1,3 +1,12 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package chapter6; import org.slf4j.Logger; Modified: logback/trunk/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml Wed Jan 21 22:57:21 2009 @@ -8,7 +8,7 @@ <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> </filter> - <layout class="ch.qos.logback.classic.PatternLayout"> + <layout> <pattern>%-4relative [%thread] %-5level %logger - %msg%n</pattern> </layout> </appender> Modified: logback/trunk/logback-examples/src/main/java/chapter7/simpleMDC.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter7/simpleMDC.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter7/simpleMDC.xml Wed Jan 21 22:57:21 2009 @@ -9,8 +9,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="CONSOLE" /> </root> </configuration> Modified: logback/trunk/logback-site/src/site/pages/manual/filters.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/filters.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/filters.html Wed Jan 21 22:57:21 2009 @@ -188,7 +188,7 @@ configuration that uses <code>LevelFilter</code>. </p> -<em>Example 6.3: Sample LevelFilter configuration (logback-examples/src/main/java/chapter6/LevelFilterConfig.xml)</em> +<em>Example 6.3: Sample LevelFilter configuration (logback-examples/src/main/java/chapter6/levelFilterConfig.xml)</em> <div class="source"><pre><configuration> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> @@ -203,8 +203,7 @@ </pattern> </layout> </appender> - <root> - <level value="DEBUG" /> + <root level="DEBUG"> <appender-ref ref="CONSOLE" /> </root> </configuration></pre></div> @@ -218,7 +217,7 @@ use of the <code>ThresholdFilter</code> is shown below. </p> -<em>Example 6.4: Sample ThresholdFilter configuration (logback-examples/src/main/java/chapter6/ThresholdFilterConfig.xml)</em> +<em>Example 6.4: Sample ThresholdFilter configuration (logback-examples/src/main/java/chapter6/thresholdFilterConfig.xml)</em> <div class="source"><pre><configuration> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> @@ -231,8 +230,7 @@ </pattern> </layout> </appender> - <root> - <level value="DEBUG" /> + <root level="DEBUG"> <appender-ref ref="CONSOLE" /> </root> </configuration></pre></div> @@ -361,15 +359,14 @@ <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> </filter></b> - <layout class="ch.qos.logback.classic.PatternLayout"> + <layout> <pattern> %-4relative [%thread] %-5level %logger - %msg%n </pattern> </layout> </appender> - <root> - <level value="INFO" /> + <root level="INFO"> <appender-ref ref="STDOUT" /> </root> </configuration></pre></div> @@ -594,8 +591,7 @@ </layout> </appender> - <root> - <level value="info"/> + <root level="info"> <appender-ref ref="console" /> </root> </configuration></pre></div> Modified: logback/trunk/logback-site/src/site/pages/manual/jmxConfig.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/jmxConfig.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/jmxConfig.html Wed Jan 21 22:57:21 2009 @@ -53,8 +53,7 @@ </layout> </appender> - <root> - <level value="debug"/> + <root level="debug"/> <appender-ref ref="console" /> </root> </configuration></p> Modified: logback/trunk/logback-site/src/site/pages/manual/joran.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/joran.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/joran.html Wed Jan 21 22:57:21 2009 @@ -846,8 +846,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <b><appender-ref ref="FILE" /> <appender-ref ref="STDOUT" /></b> </root> @@ -892,8 +891,7 @@ <appender-ref ref="STDOUT" /> </logger> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration></pre></div> @@ -946,8 +944,7 @@ <appender-ref ref="FILE" /> </logger> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration></pre></div> @@ -987,8 +984,7 @@ <appender-ref ref="FILE" /> </logger> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration></pre></div> @@ -1043,8 +1039,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="FILE" /> </root> </configuration></pre></div> @@ -1072,8 +1067,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="FILE" /> </root> </configuration></pre></div> @@ -1180,8 +1174,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="FILE" /> </root> </configuration></pre></div> Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/layouts.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/layouts.html Wed Jan 21 22:57:21 2009 @@ -166,8 +166,7 @@ <b><layout class="chapter5.MySampleLayout" /></b> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration></pre></div> @@ -271,8 +270,7 @@ </layout> </appender> - <root> - <level value="debug" /> + <root level="debug"> <appender-ref ref="STDOUT" /> </root> </configuration></p> @@ -1531,11 +1529,10 @@ <File>/test.html</File> </appender> - <root> - <level value="debug" /> - <appender-ref ref="FILE" /> - </root> -</configuration> + <root level="debug"> + <appender-ref ref="FILE" /> + </root> +</configuration> </div> <p>Launching the <code>TrivialMain</code> application listed below Modified: logback/trunk/logback-site/src/site/pages/manual/mdc.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/mdc.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/mdc.html Wed Jan 21 22:57:21 2009 @@ -425,8 +425,7 @@ </layout> </appender> - <root> - <level value ="debug"/> + <root level="debug"> <appender-ref ref="CONSOLE"/> </root> </configuration></pre></div> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Wed Jan 21 22:57:21 2009 @@ -37,7 +37,7 @@ reported by Alexis Morillo. </p> - <p>Added servleta for viewing internal status messages as an HTML + <p>Added a servlet for viewing internal status messages as an HTML table. Two separate implementations are available; one for <a href="manual/joran.html#viewingStatusMessages">logback-classic</a> and the other for <a @@ -51,7 +51,10 @@ href="http://jira.qos.ch/browse/LBCORE-77">LBCORE-77</a>. </p> - + <p>Fixed problem <a + href="http://jira.qos.ch/browse/LBCLASSIC-104">LBCLASSIC-104</a> + related to loss of MDC information in deferred logging events. + </p> <h3>29th of December 2008 - Release of version 0.9.14</h3>

1 0

[JIRA] Created: (LBCLASSIC-105) File not rolling over with SizeBasedTriggeringPolicy
by Ceki Gulcu (JIRA) 18 Jan '09

18 Jan '09

File not rolling over with SizeBasedTriggeringPolicy ---------------------------------------------------- Key: LBCLASSIC-105 URL: http://jira.qos.ch/browse/LBCLASSIC-105 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.14 Reporter: Ceki Gulcu Assignee: Logback dev list Original report http://qos.ch/pipermail/logback-user/2009-January/000878.html -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 3

[JIRA] Created: (LBCLASSIC-106) Wrong Encoding in SMTPAppender
by Ceki Gulcu (JIRA) 18 Jan '09

18 Jan '09

Wrong Encoding in SMTPAppender ------------------------------ Key: LBCLASSIC-106 URL: http://jira.qos.ch/browse/LBCLASSIC-106 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.14 Reporter: Ceki Gulcu Assignee: Logback dev list Original report http://qos.ch/pipermail/logback-user/2009-January/000879.html -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 3

[JIRA] Created: (LBCLASSIC-104) strange MDC and SMTPAppender behavior
by Ceki Gulcu (JIRA) 16 Jan '09

16 Jan '09

strange MDC and SMTPAppender behavior ------------------------------------- Key: LBCLASSIC-104 URL: http://jira.qos.ch/browse/LBCLASSIC-104 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.14 Reporter: Ceki Gulcu Assignee: Ceki Gulcu Original report: http://www.qos.ch/pipermail/logback-user/2009-January/000877.html I'm seeing unexpected behavior when I combine MDC and SMTPAppender. The MDC values appear to be lost for previous log messages when MDC.clear is called before Logger.error triggers the actual email. This does not appear to be a problem with console appender. Below is a test program that will reproduce the problem. A logback.xml that uses an SMTPAppender and a pattern that includes %mdc is required. Is there something I'm missing? Versions: slf4j-api-1.5.6.jar logback-core-0.9.14.jar logback-classic-0.9.14.jar janino-2.5.14.jar mail-1.4.1.jar java version "1.6.0_04" test program: import org.slf4j.Logger; import org.slf4j.MDC; import org.slf4j.LoggerFactory; public class TestMain { public static void main(String[] args) { Logger logger = LoggerFactory.getLogger("TestMain"); // test1... logger.debug("test1: should not have MDC"); MDC.put("key1", "val1"); MDC.put("key2", "val2"); logger.warn("test1: should have MDC(key1=val1,key2=val2) but does not"); MDC.clear(); logger.debug("test1: should not have MDC"); logger.error("test1: error message triggers email"); // test2... logger.debug("test2: should not have MDC"); MDC.put("key1", "val1"); logger.warn("test2: should have MDC(key1=val1)"); MDC.put("key2", "val2"); logger.warn("test2: should have MDC(key1=val1,key2=val2)"); MDC.put("key3", "val3"); logger.warn("test2: should have MDC(key1=val1,key2=val2,key3=val3) but does not"); MDC.clear(); logger.debug("test2: should not have MDC"); logger.error("test2: error message triggers email"); // test3... logger.debug("test3: should not have MDC"); MDC.put("key1", "val1"); logger.warn("test3: should have MDC(key1=val1)"); MDC.put("key2", "val2"); logger.warn("test3: should have MDC(key1=val1,key2=val2)"); MDC.put("key3", "val3"); logger.warn("test3: should have MDC(key1=val1,key2=val2,key3=val3)"); MDC.put("key4", "val4"); logger.warn("test3: should have MDC(key1=val1,key2=val2,key3=val3,key4=val4) but does not"); MDC.clear(); logger.debug("test3: should not have MDC"); logger.error("test3: error message triggers email"); // test4... logger.debug("test4: should not have MDC"); MDC.put("key1", "val1"); logger.warn("test4: should have MDC(key1=val1)"); MDC.put("key2", "val2"); logger.error("test4: error message triggers email and has MDC(key1=val1,key2=val2)"); MDC.clear(); logger.debug("test5: should not have MDC"); MDC.put("key1", "val1"); logger.warn("test5: should have MDC(key1=val1) but does not"); MDC.clear(); logger.debug("test5: should not have MDC"); MDC.put("key1", "val1"); logger.warn("test5: should have MDC(key1=val1)"); logger.error("test5: error message triggers email and should not have MDC"); } } -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 1

svn commit: r2128 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/net main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 15 Jan '09

15 Jan '09

Author: ceki Date: Thu Jan 15 20:02:33 2009 New Revision: 2128 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java Log: Fixes LBCLASSIC-104. The prepareForDeferredProcessing() method in LoggingEvent now creates a copy mdcPropertiesMap. It follows that if the MDC is subsequently modified, the logging events are not impacted. SMTPAppender in lb-classic now invokes event.prepareForDeferredProcessing() method in subAppend(). Added relevant test case. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java Thu Jan 15 20:02:33 2009 @@ -70,7 +70,7 @@ * a cyclic buffer. */ protected void subAppend(LoggingEvent event) { - event.getThreadName(); + event.prepareForDeferredProcessing(); cb.add(event); // addInfo("Added event to the cyclic buffer: " + event.getMessage()); } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Thu Jan 15 20:02:33 2009 @@ -14,6 +14,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.util.HashMap; import java.util.Map; import org.slf4j.MDC; @@ -177,14 +178,18 @@ /** * This method should be called prior to serializing an event. It should also - * be called when using asynchronous logging. + * be called when using asynchronous or deferred logging. * * <p> Note that due to performance concerns, this method does NOT extract - * caller data. It is the responsability of the calller to extract caller + * caller data. It is the responsibility of the caller to extract caller * information. */ public void prepareForDeferredProcessing() { this.getThreadName(); + // fixes http://jira.qos.ch/browse/LBCLASSIC-104 + if (mdcPropertyMap != null) { + mdcPropertyMap = new HashMap<String, String>(mdcPropertyMap); + } } public LoggerRemoteView getLoggerRemoteView() { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java Thu Jan 15 20:02:33 2009 @@ -14,6 +14,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.MDC; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; @@ -27,6 +28,7 @@ import ch.qos.logback.core.Layout; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.StatusPrinter; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.GreenMailUtil; @@ -46,6 +48,7 @@ @Before public void setUp() throws Exception { + MDC.clear(); ServerSetup serverSetup = new ServerSetup(port, "localhost", ServerSetup.PROTOCOL_SMTP); greenMail = new GreenMail(serverSetup); @@ -74,7 +77,7 @@ PatternLayout layout = new PatternLayout(); layout.setContext(lc); layout.setFileHeader(HEADER); - layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setPattern("%-4relative %mdc [%thread] %-5level %class - %msg%n"); layout.setFileFooter(FOOTER); layout.start(); return layout; @@ -111,6 +114,7 @@ logger.debug("hello"); logger.error("en error", new Exception("an exception")); + StatusPrinter.print(lc); MimeMultipart mp = verify(TEST_SUBJECT); String body = GreenMailUtil.getBody(mp.getBodyPart(0)); assertTrue(body.startsWith(HEADER.trim())); @@ -118,6 +122,25 @@ } @Test + public void LBCLASSIC_104() throws Exception { + buildSMTPAppender(); + smtpAppender.setLayout(buildPatternLayout(lc)); + smtpAppender.start(); + logger.addAppender(smtpAppender); + MDC.put("key", "val"); + logger.debug("hello"); + MDC.clear(); + logger.error("en error", new Exception("an exception")); + + MimeMultipart mp = verify(TEST_SUBJECT); + String body = GreenMailUtil.getBody(mp.getBodyPart(0)); + assertTrue(body.startsWith(HEADER.trim())); + assertTrue(body.contains("key=val")); + assertTrue(body.endsWith(FOOTER.trim())); + } + + + @Test public void html() throws Exception { buildSMTPAppender(); smtpAppender.setLayout(buildHTMLLayout(lc));

1 0

[JIRA] Created: (LBCORE-83) Filter list of appenders is no longer accessible
by Michael Franz (JIRA) 15 Jan '09

15 Jan '09

Filter list of appenders is no longer accessible ------------------------------------------------ Key: LBCORE-83 URL: http://jira.qos.ch/browse/LBCORE-83 Project: logback-core Issue Type: Bug Components: Appender Affects Versions: 0.9.14 Reporter: Michael Franz Assignee: Logback dev list Priority: Blocker In version 0.9.14 the getNext() method has been removed, but the FilterAttachable interface still only contains the method getFirstFilter(). This leads to the situation that for an appender only the first filter can be traversed by application code. I need to be able to access to full list to provide some visualization of the current working logging configuration. I raised this as a "blocker" since this prevents me migrating from 0.9.13 to 0.9.14. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 4

svn commit: r2127 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi
by noreply.ceki＠qos.ch 15 Jan '09

15 Jan '09

Author: ceki Date: Thu Jan 15 19:24:50 2009 New Revision: 2127 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java Log: In relation to LBCORE-83, marking the getFirstFilter method as deprecated. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java Thu Jan 15 19:24:50 2009 @@ -1,11 +1,11 @@ /** - * LOGBack: the generic, reliable, fast and flexible logging framework. - * - * Copyright (C) 1999-2006, QOS.ch - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.core.spi; @@ -26,6 +26,9 @@ /** * Get first filter in the chain. + * + * @deprecated This method will be removed in future versions. Please use + * {@link #getCopyOfAttachedFiltersList()} method instead. */ public Filter getFirstFilter();

1 0

svn commit: r2126 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi
by noreply.ceki＠qos.ch 09 Jan '09

09 Jan '09

Author: ceki Date: Fri Jan 9 19:17:44 2009 New Revision: 2126 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java Log: - javadoc changes Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java Fri Jan 9 19:17:44 2009 @@ -13,21 +13,21 @@ import ch.qos.logback.core.spi.FilterReply; /** - * This class is a context that can be used - * by access to provide the basic functionnalities of a context - * to its components, mainly SocketServer. - * + * A minimal context implementation used by certain logback-access components, + * mainly SocketServer. + * * @author Sébastien Pennec */ -public class AccessContext extends ContextBase implements AppenderAttachable<AccessEvent>, FilterAttachable<AccessEvent> { +public class AccessContext extends ContextBase implements + AppenderAttachable<AccessEvent>, FilterAttachable<AccessEvent> { AppenderAttachableImpl<AccessEvent> aai = new AppenderAttachableImpl<AccessEvent>(); FilterAttachableImpl<AccessEvent> fai = new FilterAttachableImpl<AccessEvent>(); - + public void callAppenders(AccessEvent event) { aai.appendLoopOnAppenders(event); } - + public void addAppender(Appender<AccessEvent> newAppender) { aai.addAppender(newAppender); } @@ -57,7 +57,7 @@ } public void addFilter(Filter<AccessEvent> newFilter) { - fai.addFilter(newFilter); + fai.addFilter(newFilter); } public void clearAllFilters() { @@ -67,7 +67,7 @@ public List<Filter<AccessEvent>> getCopyOfAttachedFiltersList() { return fai.getCopyOfAttachedFiltersList(); } - + public FilterReply getFilterChainDecision(AccessEvent event) { return fai.getFilterChainDecision(event); }

1 0

svn commit: r2125 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/jetty logback-access/src/main/java/ch/qos/logback/access/spi logback-access/src/main/java/ch/qos/logback/access/tomcat logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/spi
by noreply.ceki＠qos.ch 09 Jan '09

09 Jan '09

Author: ceki Date: Fri Jan 9 19:15:02 2009 New Revision: 2125 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java Log: In FiterAttachable interface, renamed getCopyOfFilterList as getCopyOfAttachedFiltersList. Related to LBCORE-83. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Fri Jan 9 19:15:02 2009 @@ -227,8 +227,8 @@ fai.clearAllFilters(); } - public List<Filter<AccessEvent>> getCopyOfFilterList() { - return fai.getCopyOfFilterList(); + public List<Filter<AccessEvent>> getCopyOfAttachedFiltersList() { + return fai.getCopyOfAttachedFiltersList(); } public FilterReply getFilterChainDecision(AccessEvent event) { Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java Fri Jan 9 19:15:02 2009 @@ -64,8 +64,8 @@ fai.clearAllFilters(); } - public List<Filter<AccessEvent>> getCopyOfFilterList() { - return fai.getCopyOfFilterList(); + public List<Filter<AccessEvent>> getCopyOfAttachedFiltersList() { + return fai.getCopyOfAttachedFiltersList(); } public FilterReply getFilterChainDecision(AccessEvent event) { Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Fri Jan 9 19:15:02 2009 @@ -229,8 +229,8 @@ fai.clearAllFilters(); } - public List<Filter<AccessEvent>> getCopyOfFilterList() { - return fai.getCopyOfFilterList(); + public List<Filter<AccessEvent>> getCopyOfAttachedFiltersList() { + return fai.getCopyOfAttachedFiltersList(); } public FilterReply getFilterChainDecision(AccessEvent event) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java Fri Jan 9 19:15:02 2009 @@ -126,8 +126,8 @@ fai.clearAllFilters(); } - public List<Filter<E>> getCopyOfFilterList() { - return fai.getCopyOfFilterList(); + public List<Filter<E>> getCopyOfAttachedFiltersList() { + return fai.getCopyOfAttachedFiltersList(); } public FilterReply getFilterChainDecision(E event) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java Fri Jan 9 19:15:02 2009 @@ -132,8 +132,8 @@ fai.clearAllFilters(); } - public List<Filter<E>> getCopyOfFilterList() { - return fai.getCopyOfFilterList(); + public List<Filter<E>> getCopyOfAttachedFiltersList() { + return fai.getCopyOfAttachedFiltersList(); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java Fri Jan 9 19:15:02 2009 @@ -37,7 +37,7 @@ * * @return all attached filters as a list */ - public List<Filter<E>> getCopyOfFilterList(); + public List<Filter<E>> getCopyOfAttachedFiltersList(); /** * Loop through the filters in the chain. As soon as a filter decides on Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java Fri Jan 9 19:15:02 2009 @@ -64,7 +64,7 @@ return FilterReply.NEUTRAL; } - public List<Filter<E>> getCopyOfFilterList() { + public List<Filter<E>> getCopyOfAttachedFiltersList() { return new ArrayList<Filter<E>>(filterList); } }

1 0

svn commit: r2124 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/jetty logback-access/src/main/java/ch/qos/logback/access/spi logback-access/src/main/java/ch/qos/logback/access/tomcat logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/spi
by noreply.ceki＠qos.ch 09 Jan '09

09 Jan '09

Author: ceki Date: Fri Jan 9 19:11:38 2009 New Revision: 2124 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java Log: In response to LBCORE-83, added getCopyOfFilterList() method to the FilterAttachable interface. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Fri Jan 9 19:11:38 2009 @@ -3,6 +3,7 @@ import java.io.File; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import org.mortbay.jetty.Request; import org.mortbay.jetty.RequestLog; @@ -226,6 +227,10 @@ fai.clearAllFilters(); } + public List<Filter<AccessEvent>> getCopyOfFilterList() { + return fai.getCopyOfFilterList(); + } + public FilterReply getFilterChainDecision(AccessEvent event) { return fai.getFilterChainDecision(event); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java Fri Jan 9 19:11:38 2009 @@ -1,6 +1,7 @@ package ch.qos.logback.access.spi; import java.util.Iterator; +import java.util.List; import ch.qos.logback.core.Appender; import ch.qos.logback.core.ContextBase; @@ -63,6 +64,10 @@ fai.clearAllFilters(); } + public List<Filter<AccessEvent>> getCopyOfFilterList() { + return fai.getCopyOfFilterList(); + } + public FilterReply getFilterChainDecision(AccessEvent event) { return fai.getFilterChainDecision(event); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Fri Jan 9 19:11:38 2009 @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import javax.servlet.ServletContext; @@ -228,6 +229,10 @@ fai.clearAllFilters(); } + public List<Filter<AccessEvent>> getCopyOfFilterList() { + return fai.getCopyOfFilterList(); + } + public FilterReply getFilterChainDecision(AccessEvent event) { return fai.getFilterChainDecision(event); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java Fri Jan 9 19:11:38 2009 @@ -9,6 +9,8 @@ */ package ch.qos.logback.core; +import java.util.List; + import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.spi.FilterAttachableImpl; @@ -124,6 +126,10 @@ fai.clearAllFilters(); } + public List<Filter<E>> getCopyOfFilterList() { + return fai.getCopyOfFilterList(); + } + public FilterReply getFilterChainDecision(E event) { return fai.getFilterChainDecision(event); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java Fri Jan 9 19:11:38 2009 @@ -9,6 +9,8 @@ */ package ch.qos.logback.core; +import java.util.List; + import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.spi.FilterAttachableImpl; @@ -130,6 +132,11 @@ fai.clearAllFilters(); } + public List<Filter<E>> getCopyOfFilterList() { + return fai.getCopyOfFilterList(); + } + + public FilterReply getFilterChainDecision(E event) { return fai.getFilterChainDecision(event); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachable.java Fri Jan 9 19:11:38 2009 @@ -9,6 +9,8 @@ */ package ch.qos.logback.core.spi; +import java.util.List; + import ch.qos.logback.core.filter.Filter; /** @@ -26,13 +28,21 @@ * Get first filter in the chain. */ public Filter getFirstFilter(); - + public void clearAllFilters(); /** - * Loop through the filters in the chain. As soon as a filter decides on + * Get a copy of all the filters contained within this FilterAttachable + * object. + * + * @return all attached filters as a list + */ + public List<Filter<E>> getCopyOfFilterList(); + + /** + * Loop through the filters in the chain. As soon as a filter decides on * ACCEPT or DENY, then that value is returned. If all of the filters return - * NEUTRAL, then NEUTRAL is returned. + * NEUTRAL, then NEUTRAL is returned. */ public FilterReply getFilterChainDecision(E event); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java Fri Jan 9 19:11:38 2009 @@ -9,6 +9,8 @@ */ package ch.qos.logback.core.spi; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import ch.qos.logback.core.filter.Filter; @@ -61,4 +63,8 @@ } return FilterReply.NEUTRAL; } + + public List<Filter<E>> getCopyOfFilterList() { + return new ArrayList<Filter<E>>(filterList); + } }

1 0