August 2008 - logback-dev - mailman3.qos.ch

svn commit: r1784 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/net logback-examples/src/main/java/chapter4/mail logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 28 Aug '08

28 Aug '08

Author: ceki Date: Thu Aug 28 09:43:26 2008 New Revision: 1784 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java logback/trunk/logback-examples/src/main/java/chapter4/mail/mail1.xml logback/trunk/logback-examples/src/main/java/chapter4/mail/mail2.xml logback/trunk/logback-site/src/site/pages/manual/appenders.html logback/trunk/logback-site/src/site/pages/manual/index_menu.js logback/trunk/logback-site/src/site/pages/news.html Log: - minor corrections and improvements 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 Aug 28 09:43:26 2008 @@ -31,7 +31,7 @@ */ public class SMTPAppender extends SMTPAppenderBase<LoggingEvent> { - static final String DEFAULT_SUBJECT_PATTERN = "%logger{20} - %m %nopex"; + static final String DEFAULT_SUBJECT_PATTERN = "%logger{20} - %m"; static final String DEFAULT_EVALUATOR_EXPRESSION = "level >= ERROR"; private int bufferSize = 512; Modified: logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java Thu Aug 28 09:43:26 2008 @@ -33,15 +33,13 @@ int runLength = Integer.parseInt(args[0]); String configFile = args[1]; - if (configFile.endsWith(".xml")) { - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - JoranConfigurator configurator = new JoranConfigurator(); - lc.shutdownAndReset(); - configurator.setContext(lc); - configurator.doConfigure(configFile); - StatusPrinter.print(lc); - } - + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + JoranConfigurator configurator = new JoranConfigurator(); + lc.shutdownAndReset(); + configurator.setContext(lc); + configurator.doConfigure(configFile); + StatusPrinter.printIfErrorsOccured(lc); + Logger logger = LoggerFactory.getLogger(EMail.class); for (int i = 1; i <= runLength; i++) { @@ -53,6 +51,8 @@ } logger.error("At last an error.", new Exception("Just testing")); + + StatusPrinter.printIfErrorsOccured(lc); } static void usage(String msg) { Modified: logback/trunk/logback-examples/src/main/java/chapter4/mail/mail1.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/mail/mail1.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/mail1.xml Thu Aug 28 09:43:26 2008 @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> - - - - <configuration> <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> <SMTPHost>ADDRESS-OF-YOUR-SMTP-HOST</SMTPHost> - <To>DESTINATION-EMAIL</To> + <To>EMAIL-DESTINATION</To> + <To>ANOTHER_EMAIL_DESTINATION</To>  <From>SENDER-EMAIL</From> + <Subject>TESTING: %logger{20} - %m</Subject> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%date %-5level %logger - %message%n</Pattern> </layout> 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 Thu Aug 28 09:43:26 2008 @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> - - - - <configuration> <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> Modified: logback/trunk/logback-site/src/site/pages/manual/appenders.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/appenders.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/appenders.html Thu Aug 28 09:43:26 2008 @@ -1888,16 +1888,16 @@ <a name="SMTPAppender"/> <h3>SMTPAppender</h3> - <p> - The <a href="../xref/ch/qos/logback/classic/net/SMTPAppender.html"><code>SMTPAppender</code></a> - accumulates logging events in a fixed-size buffer and sends them in an email when a - user specified event occurs. - By default, the email is sent as the reception of an event - of level <em>ERROR</em> or higher. + <p>The <a + href="../xref/ch/qos/logback/classic/net/SMTPAppender.html"><code>SMTPAppender</code></a> + accumulates logging events in a fixed-size buffer and sends them + in an email when a user-specified event occurs. By default, the + sending of such email is triggered by an event of level ERROR or + higher. </p> - <p> - The various options for <code>SMTPAppender</code> are summarized in the following table. + <p>The various options for <code>SMTPAppender</code> are + summarized in the following table. </p> <table class="bodyTable"> @@ -1987,35 +1987,42 @@ </tr> </table> - <p> - The SMTPAppender keeps only the last <span class="option">BufferSize</span> logging events - in its cyclic buffer, throwing away older events when its buffer becomes full. - The number of logging events delivered in any e-mail sent by <code>SMTPAppender</code> - is upper-bounded by <span class="option">BufferSize</span>. This keeps memory - requirements bounded while still delivering a reasonable amount of application context. + <p>The SMTPAppender keeps only the last <span + class="option">BufferSize</span> logging events in its cyclic + buffer, throwing away older events when its buffer becomes full. + The number of logging events delivered in any e-mail sent by + <code>SMTPAppender</code> is upper-bounded by <span + class="option">BufferSize</span>. This keeps memory requirements + bounded while still delivering a reasonable amount of application + context. + </p> + + <p>The <code>SMTPAppender</code> relies on the JavaMail API. It + has been tested with JavaMail API version 1.4. The JavaMail API + requires the JavaBeans Activation Framework package. You can + download the <a + href="http://java.sun.com/products/javamail/">JavaMail API</a> and + the <a + href="http://java.sun.com/beans/glasgow/jaf.html">Java-Beans + Activation Framework</a> from their respective websites. Make + sure to place these two jar files in the classpath before trying + the following examples. </p> - <p> - The <code>SMTPAppender</code> relies on the JavaMail API. - It has been tested with JavaMail API version 1.4. - The JavaMail API requires the JavaBeans Activation Framework package. - You can download the <a href="http://java.sun.com/products/javamail/">JavaMail API</a> - and the <a href="http://java.sun.com/beans/glasgow/jaf.html">Java-Beans Activation Framework</a> - from their respective websites. - Make sure to place these two jar files in the classpath before - trying the following examples. - </p> - - <p> - A sample application called <code>chapter4.mail.EMail</code> takes two parameters. - The first parameter is an integer corresponding to the number of logging events - to generate. The second parameter is the logback configuration file in XML format. - The last logging event generated by chapter4.mail.Email application is always an - <em>ERROR</em> event which triggers the transmission of an email message. + + <p>A sample application, <a + href="../xref/chapter4/mail/EMail.html"><code>chapter4.mail.EMail</code></a> + generates a number of log messages messages followed by a single + error message. It takes two parameters. The first parameter is an + integer corresponding to the number of logging events to + generate. The second parameter is the logback configuration + file. The last logging event generated by <em>EMail</em> + application, an ERROR, will trigger the transmission of an email + message. </p> - <p> - Here is a sample configuration file you can supply to chapter4.mail.Email: + <p>Here is a sample configuration file intended for the + <code>Email</code> application: </p> <em>Example 4.10: A sample <code>SMTPAppender</code> configuration (logback-examples/src/main/java/chapter4/mail/mail1.xml)</em> @@ -2023,7 +2030,8 @@ <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> <SMTPHost>ADDRESS-OF-YOUR-SMTP-HOST</SMTPHost> - <To>DESTINATION-EMAIL</To> + <To>EMAIL-DESTINATION</To> + <To>ANOTHER_EMAIL_DESTINATION</To>  <From>SENDER-EMAIL</From> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%date %-5level %logger{35} - %message%n</Pattern> Modified: logback/trunk/logback-site/src/site/pages/manual/index_menu.js ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/index_menu.js (original) +++ logback/trunk/logback-site/src/site/pages/manual/index_menu.js Thu Aug 28 09:43:26 2008 @@ -7,6 +7,5 @@ document.write('<p class="menu"><a href="layouts.html"><b>Ch5: Layouts</b></a>'); document.write('<p class="menu"><a href="filters.html"><b>Ch6: Filter chains</b></a>'); document.write('<p class="menu"><a href="mdc.html"><b>Ch7: Mapped Diagnostic Contexts</b></a>'); -document.write('<p class="menu"><a href="profilers.html"><b>Ch8: Profilers</b></a>'); -document.write('<p class="menu"><a href="contextSelector.html"><b>Ch9: Context Selectors</b></a>'); +document.write('<p class="menu"><a href="contextSelector.html"><b>Ch8: Context Selectors</b></a>'); 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 Thu Aug 28 09:43:26 2008 @@ -29,10 +29,11 @@ <hr width="80%" align="center" /> - <h3>XXth of XXX 2008 - Release of version 0.9.10</h3> + <h3>XXth of September 2008 - Release of version 0.9.10</h3> - <p>Logback-classic now prints its internal status in case of - errors. This has been a frequently requested feature. + <p>In case of errors during initialization, logback-classic now + <em>automatically</em> prints out its internal status. This has been + a frequently requested feature. </p> <p>The LogbackValve in logback-access (ensuring integration with @@ -59,6 +60,29 @@ developpers list. </p> + <p>Fixed issue <a + href="http://jira.qos.ch/browse/LBCORE-48">LBCORE-48</a>. During + rollover, compression of large files would bring all logging to a + halt. In this latest release, the rolled over file is first renamed, + which is a relatively fast operation, and only then is the renamed + file compressed asyncronously (in a separate thread). + </p> + + + <p>Fixed issue <a + href="http://jira.qos.ch/browse/LBCORE-27">LBCORE-27</a> reported by + Peter Royal. SMTPAppender now outputs its presentation footer and + file footer in the the correct order. + </p> + + <p>Fixed issue <a + href="http://jira.qos.ch/browse/LBCLASSIC-67">LBCLASSIC-67</a> + reported by Alessandro Fustini. SMTPAppender now correctly + configures the layout used to format the subject line of the + outgoing email. It no longer appends a lengthy stack trace to the + subject line. + </p> + <p><a href="http://jira.qos.ch/browse/LBCORE-32">LBCORE-32</a> </p>

1 0

svn commit: r1783 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html
by noreply.ceki＠qos.ch 27 Aug '08

27 Aug '08

Author: ceki Date: Wed Aug 27 22:17:20 2008 New Revision: 1783 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java Log: removing junk Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java Wed Aug 27 22:17:20 2008 @@ -74,8 +74,6 @@ sbuf.append("font-size: larger; "); sbuf.append("}"); sbuf.append(LINE_SEP); - sbuf.append(" }"); - sbuf.append("}"); sbuf.append("</style>"); } } \ No newline at end of file

1 0

[JIRA] Closed: (LBSITE-15) logback mail lists cannot be reached again
by Ceki Gulcu (JIRA) 27 Aug '08

27 Aug '08

[ http://jira.qos.ch/browse/LBSITE-15?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu closed LBSITE-15. ---------------------------- > logback mail lists cannot be reached again > ------------------------------------------ > > Key: LBSITE-15 > URL: http://jira.qos.ch/browse/LBSITE-15 > Project: logback-site > Issue Type: Bug > Components: other > Affects Versions: unspecified > Environment: Operating System: All > Platform: All > URL: http://www.dnsstuff.com/tools/dnsreport.ch?domain=qos.ch > Reporter: Ralph Goers > Assignee: Logback dev list > Fix For: unspecified > > > Hi, > my emails to the logback mail lists are consitently bouncing. A quick check on qos.ch DNS configuration shows there are serious problems with it. Likely this is why your mail server appears to never be available. > See for example this report: http://www.dnsstuff.com/tools/dnsreport.ch?domain=qos.ch -- 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 0

svn commit: r1782 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: html net
by noreply.ceki＠qos.ch 27 Aug '08

27 Aug '08

Author: ceki Date: Wed Aug 27 20:06:57 2008 New Revision: 1782 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java Log: - minor fixes Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/PackageTest.java Wed Aug 27 20:06:57 2008 @@ -1,7 +1,7 @@ /** * Logback: the generic, reliable, fast and flexible logging framework. * - * Copyright (C) 1999-2006, QOS.ch + * Copyright (C) 2000-2008, 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 @@ -9,13 +9,16 @@ */ package ch.qos.logback.classic.html; -import junit.framework.*; +import junit.framework.JUnit4TestAdapter; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class PackageTest extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(HTMLLayoutTest.class); + suite.addTest(new JUnit4TestAdapter(HTMLLayoutTest.class)); return suite; } } \ No newline at end of file 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 Wed Aug 27 20:06:57 2008 @@ -4,7 +4,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileOutputStream; import java.util.Random; import javax.mail.internet.MimeMessage; @@ -13,7 +12,6 @@ import org.dom4j.io.SAXReader; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import ch.qos.logback.classic.Logger; @@ -24,7 +22,6 @@ import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.Layout; -import ch.qos.logback.core.html.HTMLLayoutBase; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.GreenMailUtil;

1 0

[JIRA] Created: (LBCLASSIC-67) SMTPAppender r appe nds an exception to the subject line of emails
by Ceki Gulcu (JIRA) 27 Aug '08

27 Aug '08

SMTPAppender r appe nds an exception to the subject line of emails ------------------------------------------------------------------ Key: LBCLASSIC-67 URL: http://jira.qos.ch/browse/LBCLASSIC-67 Project: logback-classic Issue Type: Bug Reporter: Ceki Gulcu Assignee: Logback dev list Problem was reported by Alessandro Fustini in [1]. This problem is due to the insertion of a ThrowableInformationConverter to the converter chain in the postCompileProcessing of c.q.lb.classic.PatternLayout. [1] http://qos.ch/pipermail/logback-user/2008-August/000545.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 1

[JIRA] Resolved: (LBCORE-27) SMTPAppenderBase puts footers in wrong order
by Ceki Gulcu (JIRA) 27 Aug '08

27 Aug '08

[ http://jira.qos.ch/browse/LBCORE-27?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBCORE-27. ------------------------------ Fix Version/s: 0.9.10 Resolution: Fixed Thank you Peter! Fixed in revision 1781. > SMTPAppenderBase puts footers in wrong order > -------------------------------------------- > > Key: LBCORE-27 > URL: http://jira.qos.ch/browse/LBCORE-27 > Project: logback-core > Issue Type: Bug > Components: Appender > Affects Versions: unspecified > Environment: Operating System: Mac OS > Platform: Macintosh > Reporter: peter royal > Assignee: Logback dev list > Priority: Critical > Fix For: 0.9.10 > > Attachments: SMTP.diff > > > SMTPAppenderBase puts the layout's file footer before the presentation footer. the presentation footer should come first. > When used with the HTML layout, it results in invalid HTML (since the closing table tag is outside the closing html tag) -- 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 0

svn commit: r1781 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/html logback-classic/src/main/java/ch/qos/logback/classic/html logback-classic/src/main/java/ch/qos/logback/classic/net logback-classic/src/test/java/ch/qos/logback/classic/html logback-classic/src/test/java/ch/qos/logback/classic/net logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/html logback-core/src/main/java/ch/qos/logback/core/net
by noreply.ceki＠qos.ch 27 Aug '08

27 Aug '08

Author: ceki Date: Wed Aug 27 19:52:19 2008 New Revision: 1781 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/XHTMLEntityResolver.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/CssBuilder.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/IThrowableRenderer.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/NOPThrowableRenderer.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Log: LBCORE-27 and LBCLASSIC-67 - Fixes both LBCORE-27 and LBCLASSIC-67. - added test cases (using GreenMail) that verify that the output generated by SMTPAppender and HTMLLayout conform to xhtml1-strict.dtd - HTMLLayout* now use StringBuilder instead of StringBuffer. The former is significantly faster. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java Wed Aug 27 19:52:19 2008 @@ -24,8 +24,8 @@ public DefaultCssBuilder() { } - public void addCss(StringBuffer sbuf) { - sbuf.append("<STYLE type=\"text/css\">"); + public void addCss(StringBuilder sbuf) { + sbuf.append("<style type=\"text/css\">"); sbuf.append("table{ "); sbuf.append("margin-left: 2em; "); sbuf.append("margin-right: 2em; "); @@ -76,6 +76,6 @@ sbuf.append(LINE_SEP); sbuf.append(" }"); sbuf.append("}"); - sbuf.append("</STYLE>"); + sbuf.append("</style>"); } } \ No newline at end of file Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java Wed Aug 27 19:52:19 2008 @@ -56,8 +56,8 @@ } public String doLayout(AccessEvent event) { - StringBuffer buf = new StringBuffer(); - handleTableClosing(buf); + StringBuilder buf = new StringBuilder(); + startNewTableIfLimitReached(buf); boolean odd = true; if (((counter++) & 1) == 0) { @@ -84,7 +84,7 @@ return buf.toString(); } - private void appendEventToBuffer(StringBuffer buf, Converter<AccessEvent> c, + private void appendEventToBuffer(StringBuilder buf, Converter<AccessEvent> c, AccessEvent event) { buf.append("<td class=\""); buf.append(computeConverterName(c)); Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java Wed Aug 27 19:52:19 2008 @@ -34,8 +34,8 @@ this.url = url; } - public void addCss(StringBuffer sbuf) { - sbuf.append("<LINK REL=StyleSheet HREF=\""); + public void addCss(StringBuilder sbuf) { + sbuf.append("<link REL=StyleSheet HREF=\""); sbuf.append(url); sbuf.append("\" TITLE=\"Basic\" />"); } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java Wed Aug 27 19:52:19 2008 @@ -24,8 +24,8 @@ public DefaultCssBuilder() { } - public void addCss(StringBuffer sbuf) { - sbuf.append("<STYLE type=\"text/css\">"); + public void addCss(StringBuilder sbuf) { + sbuf.append("<style type=\"text/css\">"); sbuf.append(LINE_SEP); sbuf .append("table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }"); @@ -66,7 +66,7 @@ .append("TD.Exception { background: #A2AEE8; font-family: courier, monospace;}"); sbuf.append(LINE_SEP); - sbuf.append("</STYLE>"); + sbuf.append("</style>"); sbuf.append(LINE_SEP); } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java Wed Aug 27 19:52:19 2008 @@ -20,7 +20,7 @@ this.throwable = t; } - public void render(StringBuffer sbuf, String[] s) { + public void render(StringBuilder sbuf, String[] s) { if (s != null) { int len = s.length; if (len == 0) { @@ -38,7 +38,7 @@ } } - public void render(StringBuffer sbuf, Object eventObject) { + public void render(StringBuilder sbuf, Object eventObject) { LoggingEvent event = (LoggingEvent)eventObject; ThrowableInformation ti = event.getThrowableInformation(); if (ti != null) { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java Wed Aug 27 19:52:19 2008 @@ -55,8 +55,8 @@ } public String doLayout(LoggingEvent event) { - StringBuffer buf = new StringBuffer(); - handleTableClosing(buf); + StringBuilder buf = new StringBuilder(); + startNewTableIfLimitReached(buf); boolean odd = true; if (((counter++) & 1) == 0) { @@ -89,7 +89,7 @@ return buf.toString(); } - private void appendEventToBuffer(StringBuffer buf, Converter<LoggingEvent> c, + private void appendEventToBuffer(StringBuilder buf, Converter<LoggingEvent> c, LoggingEvent event) { buf.append("<td class=\""); buf.append(computeConverterName(c)); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java Wed Aug 27 19:52:19 2008 @@ -34,8 +34,8 @@ this.url = url; } - public void addCss(StringBuffer sbuf) { - sbuf.append("<LINK REL=StyleSheet HREF=\""); + public void addCss(StringBuilder sbuf) { + sbuf.append("<link REL=StyleSheet HREF=\""); sbuf.append(url); sbuf.append("\" TITLE=\"Basic\" />"); } 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 Wed Aug 27 19:52:19 2008 @@ -113,6 +113,10 @@ PatternLayout pl = new PatternLayout(); pl.setContext(getContext()); pl.setPattern(subjectStr); + // we don't want a ThrowableInformationConverter appended + // to the end of the converter chain + // This fixes issue LBCLASSIC-67 + pl.setPostCompileProcessor(null); pl.start(); return pl; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java Wed Aug 27 19:52:19 2008 @@ -1,35 +1,36 @@ package ch.qos.logback.classic.html; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.HashMap; import java.util.List; -import java.util.Map; - -import junit.framework.TestCase; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.io.SAXReader; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.classic.spi.ThrowableInformation; +import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.read.ListAppender; -public class HTMLLayoutTest extends TestCase { +public class HTMLLayoutTest { LoggerContext lc; Logger logger; HTMLLayout layout; - @Override + @Before public void setUp() throws Exception { - super.setUp(); lc = new LoggerContext(); lc.setName("default"); @@ -46,17 +47,17 @@ appender.start(); } - @Override + @After public void tearDown() throws Exception { - super.tearDown(); lc = null; layout = null; } @SuppressWarnings("unchecked") - public void testHeader() { + @Test + public void testHeader() throws Exception { String header = layout.getFileHeader(); - //System.out.println(header); + // System.out.println(header); Document doc = parseOutput(header + "</body></html>"); Element rootElement = doc.getRootElement(); @@ -64,11 +65,12 @@ } @SuppressWarnings("unchecked") - public void testPresentationHeader() { + @Test + public void testPresentationHeader() throws Exception { String header = layout.getFileHeader(); String presentationHeader = layout.getPresentationHeader(); header = header + presentationHeader; - //System.out.println(header); + // System.out.println(header); Document doc = parseOutput(header + "</table></body></html>"); Element rootElement = doc.getRootElement(); @@ -80,9 +82,10 @@ assertEquals("Thread", elementList.get(1).getText()); assertEquals("Message", elementList.get(2).getText()); } - + + @Test public void testAppendThrowable() throws Exception { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); String[] strArray = { "test1", "test2" }; DefaultThrowableRenderer renderer = (DefaultThrowableRenderer) layout .getThrowableRenderer(); @@ -93,12 +96,32 @@ assertEquals(DefaultThrowableRenderer.TRACE_PREFIX + "test2", result[1]); } + @Test public void testDoLayout() throws Exception { LoggingEvent le = createLoggingEvent(); - String result = layout.doLayout(le); + + String result = layout.getFileHeader(); + result += layout.getPresentationHeader(); + result += layout.doLayout(le); + result += layout.getPresentationFooter(); + result += layout.getFileFooter(); + Document doc = parseOutput(result); - Element trElement = doc.getRootElement(); - assertEquals(3, trElement.elements().size()); + Element rootElement = doc.getRootElement(); + rootElement.toString(); + + // the rest of this test is very dependent of the output generated + // by HTMLLayout. Given that the XML parser already verifies + // that the result conforms to xhtml-strict, we may want to + // skip the assertions below. However, the assertions below are another + // *independent* way to check the output format. + + // head, body + assertEquals(2, rootElement.elements().size()); + Element bodyElement = (Element) rootElement.elements().get(1); + Element tableElement = (Element) bodyElement.elements().get(3); + assertEquals("table", tableElement.getName()); + Element trElement = (Element) tableElement.elements().get(1); { Element tdElement = (Element) trElement.elements().get(0); assertEquals("DEBUG", tdElement.getText()); @@ -111,11 +134,11 @@ Element tdElement = (Element) trElement.elements().get(2); assertEquals("test message", tdElement.getText()); } - // System.out.println(result); } @SuppressWarnings("unchecked") - public void testDoLayoutWithException() throws Exception { + @Test + public void layoutWithException() throws Exception { layout.setPattern("%level %thread %msg %ex"); LoggingEvent le = createLoggingEvent(); le.setThrowableInformation(new ThrowableInformation(new Exception( @@ -141,16 +164,23 @@ assertTrue(exceptionElement.getText().contains( "java.lang.Exception: test Exception")); } - - // public void testLog() { - // for (int i = 1; i <= 10; i++) { - // if (i == 5 || i == 8) { - // logger.debug("test", new Exception("test exception")); - // } else { - // logger.debug("test message" + i); - // } - // } - // } + + @Test + public void rawLimit() throws Exception { + StringBuilder sb = new StringBuilder(); + String header = layout.getFileHeader(); + assertTrue(header.startsWith("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")); + sb.append(header); + sb.append(layout.getPresentationHeader()); + for(int i = 0; i < CoreGlobal.TABLE_ROW_LIMIT*3; i++) { + sb.append(layout.doLayout( new LoggingEvent(this.getClass().getName(), logger, + Level.DEBUG, "test message"+i, null, null))); + } + sb.append(layout.getPresentationFooter()); + sb.append(layout.getFileFooter()); + // check that the output adheres to xhtml-strict.dtd + parseOutput(sb.toString()); + } private LoggingEvent createLoggingEvent() { LoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, @@ -158,65 +188,11 @@ return le; } - Document parseOutput(String output) { - + Document parseOutput(String output) throws Exception { EntityResolver resolver = new XHTMLEntityResolver(); - SAXReader reader = new SAXReader(); + reader.setValidation(true); reader.setEntityResolver(resolver); - Document doc = null; - - try { - doc = reader.read(new ByteArrayInputStream(output.getBytes())); - } catch (Exception e) { - e.printStackTrace(); - } - return doc; - - // try { - // - // Document document = DocumentHelper.parseText(output); - // return document; - // } catch (Exception e) { - // System.err.println(e); - // fail(); - // } - // return null; - } -} - -class XHTMLEntityResolver implements EntityResolver { - - - // key: public id, value: relative path to DTD file - static Map<String, String> entityMap = new HashMap<String, String>(); - - static { - entityMap.put("-//W3C//DTD XHTML 1.0 Strict//EN", - "/dtd/xhtml1-strict.dtd"); - entityMap.put("-//W3C//ENTITIES Latin 1 for XHTML//EN", - "/dtd/xhtml-lat1.ent"); - entityMap.put("-//W3C//ENTITIES Symbols for XHTML//EN", - "/dtd/xhtml-symbol.ent"); - entityMap.put("-//W3C//ENTITIES Special for XHTML//EN", - "/dtd/xhtml-special.ent"); - } - - public InputSource resolveEntity(String publicId, String systemId) { - //System.out.println(publicId); - final String relativePath = (String)entityMap.get(publicId); - - if (relativePath != null) { - Class clazz = getClass(); - InputStream in = - clazz.getResourceAsStream(relativePath); - if (in == null) { - return null; - } else { - return new InputSource(in); - } - } else { - return null; - } + return reader.read(new ByteArrayInputStream(output.getBytes())); } } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/XHTMLEntityResolver.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/XHTMLEntityResolver.java Wed Aug 27 19:52:19 2008 @@ -0,0 +1,43 @@ +package ch.qos.logback.classic.html; + +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; + +public class XHTMLEntityResolver implements EntityResolver { + + // key: public id, value: relative path to DTD file + static Map<String, String> entityMap = new HashMap<String, String>(); + + static { + entityMap.put("-//W3C//DTD XHTML 1.0 Strict//EN", + "/dtd/xhtml1-strict.dtd"); + entityMap.put("-//W3C//ENTITIES Latin 1 for XHTML//EN", + "/dtd/xhtml-lat1.ent"); + entityMap.put("-//W3C//ENTITIES Symbols for XHTML//EN", + "/dtd/xhtml-symbol.ent"); + entityMap.put("-//W3C//ENTITIES Special for XHTML//EN", + "/dtd/xhtml-special.ent"); + } + + public InputSource resolveEntity(String publicId, String systemId) { + //System.out.println(publicId); + final String relativePath = (String)entityMap.get(publicId); + + if (relativePath != null) { + Class clazz = getClass(); + InputStream in = + clazz.getResourceAsStream(relativePath); + if (in == null) { + return null; + } else { + return new InputSource(in); + } + } else { + return null; + } + } +} 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 Wed Aug 27 19:52:19 2008 @@ -1,22 +1,33 @@ package ch.qos.logback.classic.net; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import java.io.FileOutputStream; import java.util.Random; import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; +import org.dom4j.io.SAXReader; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.html.HTMLLayout; +import ch.qos.logback.classic.html.XHTMLEntityResolver; import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.Layout; +import ch.qos.logback.core.html.HTMLLayoutBase; import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.GreenMailUtil; import com.icegreen.greenmail.util.ServerSetup; public class SMTPAppender_GreenTest { @@ -27,8 +38,9 @@ LoggerContext lc = new LoggerContext(); static final String TEST_SUBJECT = "test subject"; - - + static final String HEADER = "HEADER\n"; + static final String FOOTER = "FOOTER\n"; + @Before public void setUp() throws Exception { ServerSetup serverSetup = new ServerSetup(diff, "localhost", @@ -43,21 +55,29 @@ smtpAppender.setContext(lc); smtpAppender.setName("smtp"); smtpAppender.setFrom("user(a)host.dom"); - - smtpAppender.setLayout(buildLayout(lc)); smtpAppender.setSMTPHost("localhost"); smtpAppender.setSMTPPort(diff); smtpAppender.setSubject(TEST_SUBJECT); smtpAppender.addTo("nospam(a)qos.ch"); -// smtpAppender.start(); + // smtpAppender.start(); } - private Layout<LoggingEvent> buildLayout(LoggerContext lc) { + private Layout<LoggingEvent> buildPatternLayout(LoggerContext lc) { PatternLayout layout = new PatternLayout(); layout.setContext(lc); - layout.setFileHeader("Some header\n"); + layout.setFileHeader(HEADER); layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); - layout.setFileFooter("Some footer"); + layout.setFileFooter(FOOTER); + layout.start(); + return layout; + } + + private Layout<LoggingEvent> buildHTMLLayout(LoggerContext lc) { + HTMLLayout layout = new HTMLLayout(); + layout.setContext(lc); + // layout.setFileHeader(HEADER); + layout.setPattern("%level%class%msg"); + // layout.setFileFooter(FOOTER); layout.start(); return layout; } @@ -67,7 +87,8 @@ } @Test - public void smoke() throws Exception { + public void smoke() throws Exception { + smtpAppender.setLayout(buildPatternLayout(lc)); smtpAppender.start(); Logger logger = lc.getLogger("test"); logger.addAppender(smtpAppender); @@ -77,10 +98,69 @@ assertNotNull(mma); assertEquals(1, mma.length); MimeMessage mm = mma[0]; - + // http://jira.qos.ch/browse/LBCLASSIC-67 assertEquals(TEST_SUBJECT, mm.getSubject()); - //System.out.println(mm.getContent().toString()); - + + MimeMultipart mp = (MimeMultipart) mm.getContent(); + String body = GreenMailUtil.getBody(mp.getBodyPart(0)); + assertTrue(body.startsWith(HEADER.trim())); + assertTrue(body.endsWith(FOOTER.trim())); + } + + @Test + public void html() throws Exception { + smtpAppender.setLayout(buildHTMLLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + MimeMessage[] mma = greenMail.getReceivedMessages(); + assertNotNull(mma); + assertEquals(1, mma.length); + MimeMessage mm = mma[0]; + assertEquals(TEST_SUBJECT, mm.getSubject()); + + MimeMultipart mp = (MimeMultipart) mm.getContent(); + + // verify strict adherence to xhtml1-strict.dtd + SAXReader reader = new SAXReader(); + reader.setValidation(true); + reader.setEntityResolver(new XHTMLEntityResolver()); + reader.read(mp.getBodyPart(0).getInputStream()); + // System.out.println(GreenMailUtil.getBody(mp.getBodyPart(0))); + } + + @Test + /** + * Checks that even when many events are processed, the output is still + * conforms to xhtml-strict.dtd. + * + * Note that SMTPAppender only keeps only 500 or so (=buffer size) + * events. So the generated output will be rather short. + */ + public void htmlLong() throws Exception { + smtpAppender.setLayout(buildHTMLLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + for (int i = 0; i < CoreGlobal.TABLE_ROW_LIMIT * 3; i++) { + logger.debug("hello " + i); + } + logger.error("en error", new Exception("an exception")); + MimeMessage[] mma = greenMail.getReceivedMessages(); + assertNotNull(mma); + assertEquals(1, mma.length); + MimeMessage mm = mma[0]; + assertEquals(TEST_SUBJECT, mm.getSubject()); + + MimeMultipart mp = (MimeMultipart) mm.getContent(); + + // verify strict adherence to xhtml1-strict.dtd + SAXReader reader = new SAXReader(); + reader.setValidation(true); + reader.setEntityResolver(new XHTMLEntityResolver()); + reader.read(mp.getBodyPart(0).getInputStream()); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java Wed Aug 27 19:52:19 2008 @@ -57,4 +57,11 @@ public final static char PERCENT_CHAR = '%'; + + /** + * Number of rows before in an HTML table before, + * we close the table and create a new one + */ + public static final int TABLE_ROW_LIMIT = 10000; + } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/CssBuilder.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/CssBuilder.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/CssBuilder.java Wed Aug 27 19:52:19 2008 @@ -2,6 +2,6 @@ public interface CssBuilder { - public void addCss(StringBuffer sbuf); + public void addCss(StringBuilder sbuf); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java Wed Aug 27 19:52:19 2008 @@ -2,6 +2,7 @@ import java.util.Map; +import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.LayoutBase; import ch.qos.logback.core.pattern.Converter; import ch.qos.logback.core.pattern.ConverterUtil; @@ -22,7 +23,7 @@ protected String title = "Logback Log Messages"; - //It is the responsability of derived classes to set + //It is the responsibility of derived classes to set //this variable in their constructor to a default value. protected CssBuilder cssBuilder; @@ -30,8 +31,6 @@ // counter keeping track of the rows output protected long counter = 0; - // max number of rows before we close the table and create a new one - protected static final int ROW_LIMIT = 10000; /** * Set the <b>ConversionPattern </b> option. This is the string which controls @@ -118,15 +117,15 @@ */ @Override public String getFileHeader() { - StringBuffer sbuf = new StringBuffer(); - sbuf.append("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""); + StringBuilder sbuf = new StringBuilder(); + sbuf.append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""); sbuf.append(" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"); sbuf.append(LINE_SEP); sbuf.append("<html>"); sbuf.append(LINE_SEP); - sbuf.append("<head>"); + sbuf.append(" <head>"); sbuf.append(LINE_SEP); - sbuf.append("<title>"); + sbuf.append(" <title>"); sbuf.append(title); sbuf.append("</title>"); sbuf.append(LINE_SEP); @@ -138,7 +137,7 @@ // cssBuilder.addExternalCSS(sbuf); // } sbuf.append(LINE_SEP); - sbuf.append("</head>"); + sbuf.append(" </head>"); sbuf.append(LINE_SEP); sbuf.append("<body>"); sbuf.append(LINE_SEP); @@ -147,25 +146,24 @@ } public String getPresentationHeader() { - StringBuffer sbuf = new StringBuffer(); - sbuf.append("<hr size=\"1\" noshade=\"true\" width=\"50%\" align=\"left\" />"); + StringBuilder sbuf = new StringBuilder(); + sbuf.append("<hr/>"); sbuf.append(LINE_SEP); - sbuf.append("Log session start time "); + sbuf.append("<p>Log session start time "); sbuf.append(new java.util.Date()); - sbuf.append("<br />"); + sbuf.append("</p><p></p>"); sbuf.append(LINE_SEP); - sbuf.append("<br />"); sbuf.append(LINE_SEP); sbuf.append("<table cellspacing=\"0\">"); sbuf.append(LINE_SEP); - createTableHeader(sbuf); + buildHeaderRowForTable(sbuf); return sbuf.toString(); } - private void createTableHeader(StringBuffer sbuf) { + private void buildHeaderRowForTable(StringBuilder sbuf) { Converter c = head; String name; sbuf.append("<tr class=\"header\">"); @@ -189,7 +187,7 @@ } public String getPresentationFooter() { - StringBuffer sbuf = new StringBuffer(); + StringBuilder sbuf = new StringBuilder(); sbuf.append("</table>"); return sbuf.toString(); } @@ -199,21 +197,21 @@ */ @Override public String getFileFooter() { - StringBuffer sbuf = new StringBuffer(); + StringBuilder sbuf = new StringBuilder(); sbuf.append(LINE_SEP); sbuf.append("</body></html>"); return sbuf.toString(); } - protected void handleTableClosing(StringBuffer sbuf) { - if (this.counter >= ROW_LIMIT) { + protected void startNewTableIfLimitReached(StringBuilder sbuf) { + if (this.counter >= CoreGlobal.TABLE_ROW_LIMIT) { counter = 0; sbuf.append("</table>"); sbuf.append(LINE_SEP); - sbuf.append("<br />"); + sbuf.append("<p></p>"); sbuf.append("<table cellspacing=\"0\">"); sbuf.append(LINE_SEP); - createTableHeader(sbuf); + buildHeaderRowForTable(sbuf); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/IThrowableRenderer.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/IThrowableRenderer.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/IThrowableRenderer.java Wed Aug 27 19:52:19 2008 @@ -3,6 +3,6 @@ public interface IThrowableRenderer { - public void render(StringBuffer sbuf, Object event); + public void render(StringBuilder sbuf, Object event); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/NOPThrowableRenderer.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/NOPThrowableRenderer.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/NOPThrowableRenderer.java Wed Aug 27 19:52:19 2008 @@ -5,7 +5,7 @@ public class NOPThrowableRenderer implements IThrowableRenderer { - public void render(StringBuffer sbuf, Object event) { + public void render(StringBuilder sbuf, Object event) { return; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Wed Aug 27 19:52:19 2008 @@ -213,14 +213,15 @@ sbuf.append(presentationHeader); } fillBuffer(sbuf); - String footer = layout.getFileFooter(); - if (footer != null) { - sbuf.append(footer); - } String presentationFooter = layout.getPresentationFooter(); if (presentationFooter != null) { sbuf.append(presentationFooter); } + String footer = layout.getFileFooter(); + if (footer != null) { + sbuf.append(footer); + } + if (subjectLayout != null) { msg.setSubject(subjectLayout.doLayout(lastEventObject));

1 0

svn commit: r1780 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/pattern logback-classic/src/main/java/ch/qos/logback/classic/pattern
by noreply.ceki＠qos.ch 27 Aug '08

27 Aug '08

Author: ceki Date: Wed Aug 27 14:09:33 2008 New Revision: 1780 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/EnsureLineSeparation.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java Log: LBCLASSIC-67 Other missing files Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/EnsureLineSeparation.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/EnsureLineSeparation.java Wed Aug 27 14:09:33 2008 @@ -0,0 +1,34 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, 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.access.pattern; + +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.core.pattern.Converter; +import ch.qos.logback.core.pattern.ConverterUtil; +import ch.qos.logback.core.pattern.PostCompileProcessor; + +public class EnsureLineSeparation implements PostCompileProcessor<AccessEvent> { + + /** + * Add a line separator converter so that access event appears on a separate + * line. + */ + public void process(Converter<AccessEvent> head) { + Converter<AccessEvent> tail = ConverterUtil.findTail(head); + Converter<AccessEvent> newLineConverter = new LineSeparatorConverter(); + if (tail == null) { + head = newLineConverter; + } else { + if (!(tail instanceof LineSeparatorConverter)) { + tail.setNext(newLineConverter); + } + } + } +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java Wed Aug 27 14:09:33 2008 @@ -0,0 +1,60 @@ +package ch.qos.logback.classic.pattern; + +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.pattern.Converter; +import ch.qos.logback.core.pattern.ConverterUtil; +import ch.qos.logback.core.pattern.PostCompileProcessor; + +public class EnsureExceptionHandling implements PostCompileProcessor<LoggingEvent> { + +// public void process(Converter head) { +// // TODO Auto-generated method stub +// +// } + + /** + * This implementation checks if any of the converters in the chain handles + * exceptions. If not, then this method adds a ThrowableInformationConverter + * instance to the end of the chain. + * <p> + * This allows appenders using this layout to output exception information + * event if the user forgets to add %ex to the pattern. Note that the + * appenders defined in the Core package are not aware of exceptions nor + * LoggingEvents. + * <p> + * If for some reason the user wishes to NOT print exceptions, then she can + * add %nopex to the pattern. + * + * + */ + public void process(Converter<LoggingEvent> head) { + if (!chainHandlesThrowable(head)) { + Converter<LoggingEvent> tail = ConverterUtil.findTail(head); + Converter<LoggingEvent> exConverter = new ThrowableInformationConverter(); + if (tail == null) { + head = exConverter; + } else { + tail.setNext(exConverter); + } + } + } + + /** + * This method computes whether a chain of converters handles exceptions or + * not. + * + * @param head + * The first element of the chain + * @return true if can handle throwables contained in logging events + */ + public boolean chainHandlesThrowable(Converter head) { + Converter c = head; + while (c != null) { + if (c instanceof ThrowableHandlingConverter) { + return true; + } + c = c.getNext(); + } + return false; + } +}

1 0

svn commit: r1779 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern
by noreply.ceki＠qos.ch 27 Aug '08

27 Aug '08

Author: ceki Date: Wed Aug 27 14:08:46 2008 New Revision: 1779 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PostCompileProcessor.java Log: LBCLASSIC-67 Missing file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PostCompileProcessor.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PostCompileProcessor.java Wed Aug 27 14:08:46 2008 @@ -0,0 +1,30 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, 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.pattern; + + +/** + * Implements this to perform post compile processing for a PatternLayout. + * + * For example, PatternLayot in the classic module should add a converter for + * exception handling (otherwise exceptions would not be printed). + * + * @author Ceki Gulcu + */ +public interface PostCompileProcessor<E> { + + /** + * Post compile processing of the converter chain. + * + * @param head + * The first converter in the chain + */ + void process(Converter<E> head); +}

1 0

svn commit: r1778 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access logback-classic logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/test/java/ch/qos/logback/classic/net logback-core/src/main/java/ch/qos/logback/core/net logback-core/src/main/java/ch/qos/logback/core/pattern
by noreply.ceki＠qos.ch 26 Aug '08

26 Aug '08

Author: ceki Date: Tue Aug 26 23:14:37 2008 New Revision: 1778 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/DilutedSMTPAppenderTest.java - copied, changed from r1772, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java logback/trunk/logback-classic/pom.xml logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/ConverterUtil.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java Log: LBCLASSIC-67 Not not all PatternLayout instances need to have a ThrowableInformationConverter added at the end of the converter chain by the postCompileProcessing() method. With this commit, post compile processing code has been moved to an interface. By default, PatternLayouts that ship with logback have a default post compile processor. However, it is now very easy to set processor to null. We now test SMTPAppender using GreenMail. Problem described in LBCLASSIC-67 is reproduced in tests but not yet fixed. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Tue Aug 26 23:14:37 2008 @@ -14,6 +14,7 @@ import ch.qos.logback.access.pattern.ContentLengthConverter; import ch.qos.logback.access.pattern.DateConverter; +import ch.qos.logback.access.pattern.EnsureLineSeparation; import ch.qos.logback.access.pattern.FullRequestConverter; import ch.qos.logback.access.pattern.FullResponseConverter; import ch.qos.logback.access.pattern.LineSeparatorConverter; @@ -37,7 +38,6 @@ import ch.qos.logback.access.pattern.ServerNameConverter; import ch.qos.logback.access.pattern.StatusCodeConverter; import ch.qos.logback.access.spi.AccessEvent; -import ch.qos.logback.core.pattern.Converter; import ch.qos.logback.core.pattern.PatternLayoutBase; /** @@ -146,9 +146,12 @@ defaultConverterMap.put("n", LineSeparatorConverter.class.getName()); } + public PatternLayout() { // set a default value for pattern setPattern(CLF_PATTERN); + // by default postCompileProcessor the is an EnsureLineSeparation instance + this.postCompileProcessor = new EnsureLineSeparation(); } /** @@ -158,24 +161,6 @@ return defaultConverterMap; } - /** - * Add a line separator so that each line is on a separate line. - */ - @SuppressWarnings("unchecked") - @Override - protected void postCompileProcessing(Converter<AccessEvent> head) { - Converter<AccessEvent> tail = findTail(head); - Converter<AccessEvent> newLineConverter = new LineSeparatorConverter(); - if (tail == null) { - head = newLineConverter; - } else { - if (!(tail instanceof LineSeparatorConverter)) { - tail.setNext(newLineConverter); - } - } - setContextForConverters(head); - } - public String doLayout(AccessEvent event) { if (!isStarted()) { return null; Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Tue Aug 26 23:14:37 2008 @@ -107,6 +107,14 @@ <optional>true</optional> </dependency> + <dependency> + <groupId>com.icegreen</groupId> + <artifactId>greenmail</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + + </dependencies> <build> Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java Tue Aug 26 23:14:37 2008 @@ -13,6 +13,7 @@ import java.util.Map; import ch.qos.logback.classic.pattern.CallerDataConverter; +import ch.qos.logback.classic.pattern.EnsureExceptionHandling; import ch.qos.logback.classic.pattern.ClassOfCallerConverter; import ch.qos.logback.classic.pattern.DateConverter; import ch.qos.logback.classic.pattern.FileOfCallerConverter; @@ -27,11 +28,9 @@ import ch.qos.logback.classic.pattern.NopThrowableInformationConverter; import ch.qos.logback.classic.pattern.RelativeTimeConverter; import ch.qos.logback.classic.pattern.ThreadConverter; -import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; import ch.qos.logback.classic.pattern.ThrowableInformationConverter; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.CoreGlobal; -import ch.qos.logback.core.pattern.Converter; import ch.qos.logback.core.pattern.PatternLayoutBase; /** @@ -109,57 +108,14 @@ defaultConverterMap.put("n", LineSeparatorConverter.class.getName()); } - /** - * This implementation checks if any of the converters in the chain handles - * exceptions. If not, then this method adds a ThrowableInformationConverter - * instance to the end of the chain. - * <p> - * This allows appenders using this layout to output exception information - * event if the user forgets to add %ex to the pattern. Note that the - * appenders defined in the Core package are not aware of exceptions nor - * LoggingEvents. - * <p> - * If for some reason the user wishes to NOT print exceptions, then she can - * add %nopex to the pattern. - * - * - */ - protected void postCompileProcessing(Converter<LoggingEvent> head) { - if (!chainHandlesThrowable(head)) { - Converter<LoggingEvent> tail = findTail(head); - Converter<LoggingEvent> exConverter = new ThrowableInformationConverter(); - if (tail == null) { - head = exConverter; - } else { - tail.setNext(exConverter); - } - } - setContextForConverters(head); + public PatternLayout() { + this.postCompileProcessor = new EnsureExceptionHandling(); } - + public Map<String, String> getDefaultConverterMap() { return defaultConverterMap; } - - /** - * This method computes whether a chain of converters handles exceptions or - * not. - * - * @param head - * The first element of the chain - * @return true if can handle throwables contained in logging events - */ - public static boolean chainHandlesThrowable(Converter head) { - Converter c = head; - while (c != null) { - if (c instanceof ThrowableHandlingConverter) { - return true; - } - c = c.getNext(); - } - return false; - } - + public String doLayout(LoggingEvent event) { if (!isStarted()) { return CoreGlobal.EMPTY_STRING; Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/DilutedSMTPAppenderTest.java (from r1772, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/DilutedSMTPAppenderTest.java Tue Aug 26 23:14:37 2008 @@ -1,21 +1,28 @@ package ch.qos.logback.classic.net; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import javax.mail.Address; import javax.mail.MessagingException; -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Layout; -public class SMTPAppenderTest extends TestCase { +public class DilutedSMTPAppenderTest { SMTPAppender appender; + @Before public void setUp() throws Exception { - super.setUp(); LoggerContext lc = new LoggerContext(); appender = new SMTPAppender(); appender.setContext(lc); @@ -28,11 +35,22 @@ appender.start(); } + private static Layout<LoggingEvent> buildLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setFileHeader("Some header\n"); + layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setFileFooter("Some footer"); + layout.start(); + return layout; + } + + @After public void tearDown() throws Exception { - super.tearDown(); appender = null; } + @Test public void testStart() { try { Address[] addressArray = appender.getMessage().getFrom(); @@ -55,6 +73,7 @@ } } + @Test public void testAppendNonTriggeringEvent() { LoggingEvent event = new LoggingEvent(); event.setThreadName("thead name"); @@ -63,36 +82,34 @@ assertEquals(1, appender.cb.length()); } + @Test public void testEntryConditionsCheck() { appender.checkEntryConditions(); assertEquals(0, appender.getContext().getStatusManager().getCount()); } + @Test public void testEntryConditionsCheckNoMessage() { appender.setMessage(null); appender.checkEntryConditions(); assertEquals(1, appender.getContext().getStatusManager().getCount()); } - public void setTriggeringPolicy() { + @Test + public void testTriggeringPolicy() { appender.setEvaluator(null); appender.checkEntryConditions(); assertEquals(1, appender.getContext().getStatusManager().getCount()); } - + + @Test public void testEntryConditionsCheckNoLayout() { appender.setLayout(null); appender.checkEntryConditions(); assertEquals(1, appender.getContext().getStatusManager().getCount()); } + + - private static Layout<LoggingEvent> buildLayout(LoggerContext lc) { - PatternLayout layout = new PatternLayout(); - layout.setContext(lc); - layout.setFileHeader("Some header\n"); - layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); - layout.setFileFooter("Some footer"); - layout.start(); - return layout; - } + } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java Tue Aug 26 23:14:37 2008 @@ -20,7 +20,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new JUnit4TestAdapter(SyslogAppenderTest.class)); - suite.addTestSuite(SMTPAppenderTest.class); + suite.addTest(new JUnit4TestAdapter(DilutedSMTPAppenderTest.class)); suite.addTest(new JUnit4TestAdapter(SocketAppenderTest.class)); suite.addTestSuite(JMSTopicAppenderTest.class); return suite; Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java Tue Aug 26 23:14:37 2008 @@ -0,0 +1,86 @@ +package ch.qos.logback.classic.net; + +import static org.junit.Assert.*; + +import java.util.Random; + +import javax.mail.internet.MimeMessage; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.Layout; + +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.ServerSetup; + +public class SMTPAppender_GreenTest { + + int diff = 1024 + new Random().nextInt(10000); + GreenMail greenMail; + SMTPAppender smtpAppender; + LoggerContext lc = new LoggerContext(); + + static final String TEST_SUBJECT = "test subject"; + + + @Before + public void setUp() throws Exception { + ServerSetup serverSetup = new ServerSetup(diff, "localhost", + ServerSetup.PROTOCOL_SMTP); + greenMail = new GreenMail(serverSetup); + greenMail.start(); + buildSMTPAppender(); + } + + void buildSMTPAppender() throws Exception { + smtpAppender = new SMTPAppender(); + smtpAppender.setContext(lc); + smtpAppender.setName("smtp"); + smtpAppender.setFrom("user(a)host.dom"); + + smtpAppender.setLayout(buildLayout(lc)); + smtpAppender.setSMTPHost("localhost"); + smtpAppender.setSMTPPort(diff); + smtpAppender.setSubject(TEST_SUBJECT); + smtpAppender.addTo("nospam(a)qos.ch"); +// smtpAppender.start(); + } + + private Layout<LoggingEvent> buildLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setFileHeader("Some header\n"); + layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setFileFooter("Some footer"); + layout.start(); + return layout; + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void smoke() throws Exception { + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + MimeMessage[] mma = greenMail.getReceivedMessages(); + assertNotNull(mma); + assertEquals(1, mma.length); + MimeMessage mm = mma[0]; + + assertEquals(TEST_SUBJECT, mm.getSubject()); + //System.out.println(mm.getContent().toString()); + + } + +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Tue Aug 26 23:14:37 2008 @@ -48,7 +48,8 @@ private String from; private String subjectStr = null; private String smtpHost; - + private int smtpPort = 25; + protected Message msg; protected EventEvaluator eventEvaluator; @@ -72,7 +73,9 @@ if (smtpHost != null) { props.put("mail.smtp.host", smtpHost); } - + props.put("mail.smtp.port", Integer.toString(smtpPort)); + + Session session = Session.getInstance(props, null); // session.setDebug(true); msg = new MimeMessage(session); @@ -284,6 +287,23 @@ } /** + * The port where the SMTP server is running. Default value is 25. + * + * @param port + */ + public void setSMTPPort(int port) { + this.smtpPort = port; + } + + /** + * @see #setSMTPPort(int) + * @return + */ + public int getSMTPPort() { + return smtpPort; + } + + /** * The <b>To</b> option takes a string value which should be * an e-mail address of one of the recipients. */ Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/ConverterUtil.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/ConverterUtil.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/ConverterUtil.java Tue Aug 26 23:14:37 2008 @@ -31,4 +31,17 @@ } } + + public static<E> Converter<E> findTail(Converter<E> head) { + Converter<E> c = head; + while (c != null) { + Converter<E> next = c.getNext(); + if (next == null) { + break; + } else { + c = next; + } + } + return c; + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java Tue Aug 26 23:14:37 2008 @@ -27,7 +27,8 @@ Converter<E> head; String pattern; - + protected PostCompileProcessor<E> postCompileProcessor; + Map<String, String> instanceConverterMap = new HashMap<String, String>(); /** @@ -77,7 +78,10 @@ } Node t = p.parse(); this.head = p.compile(t, getEffectiveConverterMap()); - postCompileProcessing(head); + if(postCompileProcessor != null) { + postCompileProcessor.process(head); + } + setContextForConverters(head); ConverterUtil.startConverters(this.head); super.start(); } catch (ScanException sce) { @@ -87,18 +91,12 @@ } } - /** - * Let derived classes perform postCompile processing. However, PatternLayout - * found in the classic module needs to add a converter for exception handling - * if there isn't one already. - * - * @param head - */ - protected void postCompileProcessing(Converter<E> head) { + public void setPostCompileProcessor( + PostCompileProcessor<E> postCompileProcessor) { + this.postCompileProcessor = postCompileProcessor; } protected void setContextForConverters(Converter<E> head) { - Context context = getContext(); Converter c = head; while (c != null) { @@ -131,19 +129,6 @@ return this.getClass().getName() + "(" + getPattern() + ")"; } - protected Converter<E> findTail(Converter<E> head) { - Converter<E> c = head; - while (c != null) { - Converter<E> next = c.getNext(); - if (next == null) { - break; - } else { - c = next; - } - } - return c; - } - public Map<String, String> getInstanceConverterMap() { return instanceConverterMap; }

1 0