- logback-dev - mailman3.qos.ch

[JIRA] Resolved: (LBCLASSIC-30) Make ContextSelectors truely pluggable/configurable
by Ceki Gulcu (JIRA) 28 Dec '08

28 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-30?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu resolved LBCLASSIC-30. --------------------------------- Fix Version/s: 0.9.14 Resolution: Fixed The documentation on context selectors now mentions that any context selector implementation needs to have a constructor admitting a LoggerContext instance as its only parameter. > Make ContextSelectors truely pluggable/configurable > --------------------------------------------------- > > Key: LBCLASSIC-30 > URL: http://jira.qos.ch/browse/LBCLASSIC-30 > Project: logback-classic > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Lars Ködderitzsch > Assignee: Logback dev list > Fix For: 0.9.14 > > > Currently the ContextSelectors in Logback are limited to Default and JNDI, whereas a system property leads to ContextJNDISelector being pulled. > This stuff is all hardcoded therefore not configurable. > I cannot use ContextJNDISelector because of a bug(?) in Websphere 6.1. In WS 6.1. env-entry values are seemingly bound to the JNDI at a very late point. > This leads to that the JNDI lookups fail because Logback initializes (through jlc-over-sl4j) way earlier in the application startup phase. > It boils down to that I cannot use ContextJNDISelector in WS 6.1. > For this reason I wanted to provide a custom ContextSelector to Logback, which is currently not possible. -- 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

[JIRA] Closed: (LBCLASSIC-30) Make ContextSelectors truely pluggable/configurable
by Ceki Gulcu (JIRA) 28 Dec '08

28 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-30?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu closed LBCLASSIC-30. ------------------------------- > Make ContextSelectors truely pluggable/configurable > --------------------------------------------------- > > Key: LBCLASSIC-30 > URL: http://jira.qos.ch/browse/LBCLASSIC-30 > Project: logback-classic > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Lars Ködderitzsch > Assignee: Logback dev list > Fix For: 0.9.14 > > > Currently the ContextSelectors in Logback are limited to Default and JNDI, whereas a system property leads to ContextJNDISelector being pulled. > This stuff is all hardcoded therefore not configurable. > I cannot use ContextJNDISelector because of a bug(?) in Websphere 6.1. In WS 6.1. env-entry values are seemingly bound to the JNDI at a very late point. > This leads to that the JNDI lookups fail because Logback initializes (through jlc-over-sl4j) way earlier in the application startup phase. > It boils down to that I cannot use ContextJNDISelector in WS 6.1. > For this reason I wanted to provide a custom ContextSelector to Logback, which is currently not possible. -- 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

[JIRA] Created: (LBCORE-51) LoggerFactory doesnt respect custom ContextSelector
by Paul Gregoire (JIRA) 28 Dec '08

28 Dec '08

LoggerFactory doesnt respect custom ContextSelector --------------------------------------------------- Key: LBCORE-51 URL: http://jira.qos.ch/browse/LBCORE-51 Project: logback-core Issue Type: Bug Environment: Windows XP64, Java 6, Red5 v0.7.1-dev, Logback 0.9.9, Slf4j 1.5.0 Reporter: Paul Gregoire Assignee: Logback dev list I have found that calling LoggerFactory.getLogger(xxxx) does not make calls to my custom context selector. I expect to see a call to getLoggerContext() but I dont. Do I need to create my own LoggerFactory impl to get my web context apps and red5 apps to use their own Loggers? Main Red5 trunk (dev) http://svn1.cvsdude.com/osflash/red5/java/server/trunk/ My logger implementations http://svn1.cvsdude.com/osflash/red5/java/server/trunk/src/org/red5/logging/ Example JSP I used to test the log context selection <%@page import="org.slf4j.Logger,org.slf4j.LoggerFactory,org.slf4j.impl.StaticLoggerBinder,ch.qos.logback.classic.LoggerContext,org.red5.logging.LoggingContextSelector"%> <html> <body> <% // Logger log = LoggerFactory.getLogger("TestJsp"); log.info("This is a test log entry from a web context"); // LoggingContextSelector selector = (LoggingContextSelector) StaticLoggerBinder.SINGLETON.getContextSelector(); LoggerContext ctx = selector.getLoggerContext(mywebappcontextname); Logger log2 = ctx.getLogger("TestJsp"); log2.info("This is a test log entry from a web context attempt 2"); %> </body> </html> The first log goes to the "default" logger context and the second goes to the correct one. I also implemented the Servlet filter and context listener for this tested context. Anything I can do to help, please let me know.. I am getting extremely frustrated with this logging stuff and I'm sure our users are as well. -- 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 13

[JIRA] Closed: (LBCLASSIC-87) LoggerContextFilter is useless (org.slf4j.Loggerfactory bug ++)
by Ceki Gulcu (JIRA) 28 Dec '08

28 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-87?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu closed LBCLASSIC-87. ------------------------------- > LoggerContextFilter is useless (org.slf4j.Loggerfactory bug ++) > --------------------------------------------------------------- > > Key: LBCLASSIC-87 > URL: http://jira.qos.ch/browse/LBCLASSIC-87 > Project: logback-classic > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: All > Platform: All > Reporter: Jens Elkner > Assignee: Logback dev list > > Since LoggerFactory obtains the LoggerContext to use in its static init stage, using a LoggerContextFilter as described in Chapter 8 is completely useless, since the JNDI selector is never consulted again. > Digging deeper on that issue reveals, that using a ContextJNDISelector (even if it would work) rarely leads to the intended behavior (e.g. webapp related logging), and is probably not thread safe wrt. common practice and intended logging. E.g. in tomcat we have two different cases: > a) each webapp provides its own slfj4*.jar as well as *logback*.jar > b) slfj4*.jar as well as *logback*.jar are shared via tomcat/common/lib or > tomcat/share/lib > c) a und b mixed > Well, to get things right, one can say case c) is unsupported ;-). > In case a) logback has its own playground, so using JNDI doesn't make sense at all, since the webapp/logback has its own playground - doesn't interfere with > other web apps since loaded via its dedicated classloader. > However case b) is a little bit more challenging. Here the LoggerFactory and other classes are !shared! between several webapps, since loading is delegated from the dedicated webapp classloader to the shared webapp classloader, which picks up everything in share/lib , common/lib. So right now in 0.9.7, even if one uses JNDISelector a per webapp logging is impossible: The first webapp, which asks for a LoggerFactory always wins! All other webapps, which ask later for a LoggerFactory.getLogger() will get a Logger from the LoggerContext associated with the first webapp, since the context is "cached", i.e. the JNDI selector gets never consulted again. > Assuming the LoggerFactory problem gets fixed by using e.g. > public static Logger getLogger(* *) { > return StaticLoggerBinder.SINGLETON.getLoggerFactory().getLogger(**); > } > there is still a problem wrt. common practice aka log* usage pattern and webapp shared classes, which can not be resolved by JNDI: Today most developer use something like: > public class XY { > private static [final] Logger log = LoggerFactory.getLogger(XY.class); > ... > } > That implies the same problem, as with the current LoggerFactory bug: The class gets the Logger from the context associated with the first webapp, which needs the shared class. And that's why all other webapps, which later need this class will use the the logger context of the first webapp. So e.g. if webapp A is configured to log to /var/log/a.log and another webapp B is configured to log to /var/log/b.log the loging output of shared classes will always go to /var/log/a.log if webapp used the classes in question first, no matter on which thread aka in which webapp the shared classes are used. > So even if LoggerFactory gets fixed, JNDI selector is of little use, if one wants to have a webapp dedicated log as soon as shared classes are involved. > The only way to solve the didcated webapp log problem a can think of, to introduce another level of indirection in the Logger.log* etc. method, which takes care of thread local settings and the settings of its parent threads (e.g. an application may start other threads, which do not inherit the thread local settings from the current thread ...). But this would probably influence the performance of logback in a rather negative way. > Another idea might be an architecture re-design: sharing Loggers would be no problem because of thread local AppenderContext soft ref, which points to an Appender in the global AppenderStore singleton ... > RFE: These problems should be reflected chapter 8 of the logback manual to avoid further confusion ... -- 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

[JIRA] Resolved: (LBCLASSIC-87) LoggerContextFilter is useless (org.slf4j.Loggerfactory bug ++)
by Ceki Gulcu (JIRA) 28 Dec '08

28 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-87?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu resolved LBCLASSIC-87. --------------------------------- Resolution: Fixed In a nutshell, I consider this issue a duplicate of SLF4J bug 113. See also [1]. In each call to getLogger() method, org.slf4j.LoggerContext will now retrieve the ILoggerFactory afresh from StaticLoggerBinder. This change enables context selectors of native implementations, e.g logback, to work correctly. Static logger references in shared classes relate to a different problem. If you need static references problem to be dealt with, then please file a *new* jira issue. As such, I am closing this issue as "fixed". [1] http://bugzilla.slf4j.org/show_bug.cgi?id=113 > LoggerContextFilter is useless (org.slf4j.Loggerfactory bug ++) > --------------------------------------------------------------- > > Key: LBCLASSIC-87 > URL: http://jira.qos.ch/browse/LBCLASSIC-87 > Project: logback-classic > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: All > Platform: All > Reporter: Jens Elkner > Assignee: Logback dev list > > Since LoggerFactory obtains the LoggerContext to use in its static init stage, using a LoggerContextFilter as described in Chapter 8 is completely useless, since the JNDI selector is never consulted again. > Digging deeper on that issue reveals, that using a ContextJNDISelector (even if it would work) rarely leads to the intended behavior (e.g. webapp related logging), and is probably not thread safe wrt. common practice and intended logging. E.g. in tomcat we have two different cases: > a) each webapp provides its own slfj4*.jar as well as *logback*.jar > b) slfj4*.jar as well as *logback*.jar are shared via tomcat/common/lib or > tomcat/share/lib > c) a und b mixed > Well, to get things right, one can say case c) is unsupported ;-). > In case a) logback has its own playground, so using JNDI doesn't make sense at all, since the webapp/logback has its own playground - doesn't interfere with > other web apps since loaded via its dedicated classloader. > However case b) is a little bit more challenging. Here the LoggerFactory and other classes are !shared! between several webapps, since loading is delegated from the dedicated webapp classloader to the shared webapp classloader, which picks up everything in share/lib , common/lib. So right now in 0.9.7, even if one uses JNDISelector a per webapp logging is impossible: The first webapp, which asks for a LoggerFactory always wins! All other webapps, which ask later for a LoggerFactory.getLogger() will get a Logger from the LoggerContext associated with the first webapp, since the context is "cached", i.e. the JNDI selector gets never consulted again. > Assuming the LoggerFactory problem gets fixed by using e.g. > public static Logger getLogger(* *) { > return StaticLoggerBinder.SINGLETON.getLoggerFactory().getLogger(**); > } > there is still a problem wrt. common practice aka log* usage pattern and webapp shared classes, which can not be resolved by JNDI: Today most developer use something like: > public class XY { > private static [final] Logger log = LoggerFactory.getLogger(XY.class); > ... > } > That implies the same problem, as with the current LoggerFactory bug: The class gets the Logger from the context associated with the first webapp, which needs the shared class. And that's why all other webapps, which later need this class will use the the logger context of the first webapp. So e.g. if webapp A is configured to log to /var/log/a.log and another webapp B is configured to log to /var/log/b.log the loging output of shared classes will always go to /var/log/a.log if webapp used the classes in question first, no matter on which thread aka in which webapp the shared classes are used. > So even if LoggerFactory gets fixed, JNDI selector is of little use, if one wants to have a webapp dedicated log as soon as shared classes are involved. > The only way to solve the didcated webapp log problem a can think of, to introduce another level of indirection in the Logger.log* etc. method, which takes care of thread local settings and the settings of its parent threads (e.g. an application may start other threads, which do not inherit the thread local settings from the current thread ...). But this would probably influence the performance of logback in a rather negative way. > Another idea might be an architecture re-design: sharing Loggers would be no problem because of thread local AppenderContext soft ref, which points to an Appender in the global AppenderStore singleton ... > RFE: These problems should be reflected chapter 8 of the logback manual to avoid further confusion ... -- 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

[JIRA] Resolved: (LBCLASSIC-55) Report URL config has been loaded from when debug="true"
by Ceki Gulcu (JIRA) 28 Dec '08

28 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-55?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu resolved LBCLASSIC-55. --------------------------------- Fix Version/s: 0.9.14 Resolution: Fixed ContextInitializer will now print the url of the configration it is using. As Henric observes, this should help reduce confusion when multiple config files are found on the class path. Fixed in revision 2108. > Report URL config has been loaded from when debug="true" > -------------------------------------------------------- > > Key: LBCLASSIC-55 > URL: http://jira.qos.ch/browse/LBCLASSIC-55 > Project: logback-classic > Issue Type: Improvement > Reporter: Anton Tagunov > Assignee: Ceki Gulcu > Fix For: 0.9.14 > > > Hi! > <configuration debug="true"> is nice. > It will be even nicer if it also reports what URL the config is being loaded from. > Thx! -- 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: r2108 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util
by noreply.ceki＠qos.ch 28 Dec '08

28 Dec '08

Author: ceki Date: Sun Dec 28 20:46:10 2008 New Revision: 2108 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Log: ContextInitializer now prints the url it uses for default configuration. This was requested in LBCLASSIC-55. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Sun Dec 28 20:46:10 2008 @@ -111,7 +111,7 @@ sm.add(new InfoStatus("Could NOT find resource [" + resourceName + "]", loggerContext)); } else { - sm.add(new InfoStatus("Found resource [" + resourceName + "]", + sm.add(new InfoStatus("Found resource [" + resourceName + "] at ["+url.toString()+"]", loggerContext)); } }

1 0

svn commit: r2107 - logback/trunk/logback-site/src/site/pages
by noreply.ceki＠qos.ch 28 Dec '08

28 Dec '08

Author: ceki Date: Sun Dec 28 20:35:24 2008 New Revision: 2107 Modified: logback/trunk/logback-site/src/site/pages/news.html Log: - update news.html file 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 Sun Dec 28 20:35:24 2008 @@ -60,6 +60,29 @@ reported by Francois Terrier. + + Evaluators are now wired into an appender automatically + (implicit rules) without the help of + <code>EvaluatorAction</code>. EvaluatorAction is now only needed + for global evaluator elements. It follows that name attribute is + necessary only for global evaluators. Embedded evaluators no + longer need a name. This change fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-100">LBCLASSIC-100</a>. In + addition, <code>EvaluatorAction</code> has been modified to accept + evaluators of any type and not just instances of + <code>JaninoEvaluator</code>. + + + <code>HTMLLayout</code> now honors custom conversion words, + thus fixing <a + href="http://jira.qos.ch/browse/LBCORE-74">LBCORE-74</a> as + reported by Natan Cox. + + SMTPAppender im logback-classic now defaults to + <code>OnErrorEvaluator</code> instead of a janino-based + evaluator. Thus, by default <code>SMTPAppender</code> no longer + depends on Janino. + <h3>5th of December 2008 - Release of version 0.9.13</h3> A <code>NullPointerException</code> was being thrown when a the

1 0

[JIRA] Created: (LBCORE-74) Converters do not work in all appenders
by Natan Cox (JIRA) 28 Dec '08

28 Dec '08

Converters do not work in all appenders --------------------------------------- Key: LBCORE-74 URL: http://jira.qos.ch/browse/LBCORE-74 Project: logback-core Issue Type: Improvement Components: Pattern Affects Versions: 0.9.11 Reporter: Natan Cox Assignee: Logback dev list I'm trying to use a converter in HtmlLayout but it was not logged correctly. I'm basically getting a "PARSER_ERRER". I checked the code and found HTMLLayoutBase.start() does this.head = p.compile(t, getDefaultConverterMap()); where protected Map<String, String> getDefaultConverterMap() { return PatternLayout.defaultConverterMap; } But PatternLayoutBase.start() does this.head = p.compile(t, getEffectiveConverterMap()); and getEffectiveConverterMap loads the extra converters. This is probably in issue in other Appenders too. Maybe the solution can be generified to make it work for every appender? -- 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 1

svn commit: r2106 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/html logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/main/java/ch/qos/logback/classic/html logback-classic/src/test/input/joran logback-classic/src/test/input/joran/conversionRule logback-classic/src/test/java/ch/qos/logback/classic logback-classic/src/test/java/ch/qos/logback/classic/html logback-classic/src/test/java/ch/qos/logback/classic/joran logback-classic/src/test/java/ch/q
by noreply.ceki＠qos.ch 28 Dec '08

28 Dec '08

Author: ceki Date: Sun Dec 28 20:31:49 2008 New Revision: 2106 Added: logback/trunk/logback-classic/src/test/input/joran/conversionRule/ logback/trunk/logback-classic/src/test/input/joran/conversionRule/htmlLayout0.xml logback/trunk/logback-classic/src/test/input/joran/conversionRule/patternLayout0.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/testUtil/ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/testUtil/SampleConverter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/testUtil/StringListAppender.java - copied, changed from r2086, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/StringListAppender.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/StringListAppender.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java logback/trunk/logback-classic/src/test/input/joran/callerData.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.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/joran/JoranConfiguratorTest.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/joran/action/ConversionRuleAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java logback/trunk/logback-examples/src/main/java/chapter6/GoMDC.java Log: - Fix LBCORE-74 HTMLLayoutBase now takes into custom conversion words. - Moved StringListAppender to c.q.l.classic.testUtil package 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 Sun Dec 28 20:31:49 2008 @@ -10,14 +10,14 @@ package ch.qos.logback.access.html; +import static ch.qos.logback.core.CoreConstants.LINE_SEPARATOR; + import java.util.Map; import ch.qos.logback.access.PatternLayout; import ch.qos.logback.access.spi.AccessEvent; import ch.qos.logback.core.html.HTMLLayoutBase; -import ch.qos.logback.core.html.NOPThrowableRenderer; import ch.qos.logback.core.pattern.Converter; -import static ch.qos.logback.core.CoreConstants.LINE_SEPARATOR; /** * @@ -47,7 +47,6 @@ */ public HTMLLayout() { pattern = DEFAULT_CONVERSION_PATTERN; - throwableRenderer = new NOPThrowableRenderer(); cssBuilder = new DefaultCssBuilder(); } 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 Sun Dec 28 20:31:49 2008 @@ -50,8 +50,6 @@ public class PatternLayout extends PatternLayoutBase<LoggingEvent> { - // FIXME fix exception handling - public static final Map<String, String> defaultConverterMap = new HashMap<String, String>(); static { 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 Sun Dec 28 20:31:49 2008 @@ -16,30 +16,31 @@ import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.classic.html.DefaultCssBuilder; import ch.qos.logback.core.html.HTMLLayoutBase; +import ch.qos.logback.core.html.IThrowableRenderer; import ch.qos.logback.core.pattern.Converter; import static ch.qos.logback.core.CoreConstants.LINE_SEPARATOR; /** * - * HTMLLayout outputs events in an HTML table. - * - * The content of the table columns are specified using a conversion pattern. - * See {@link ch.qos.logback.classic.PatternLayout} for documentation on the - * available patterns. - * - * For more information about this layout, please refer to the online manual at + * HTMLLayout outputs events in an HTML table. The content of the table + * columns are specified using a conversion pattern. See + * {@link ch.qos.logback.classic.PatternLayout} for documentation on the + * available patterns. For more information about this layout, please refer + * to the online manual at * http://logback.qos.ch/manual/layouts.html#ClassicHTMLLayout * * @author Ceki Gülcü * @author Sébastien Pennec */ public class HTMLLayout extends HTMLLayoutBase<LoggingEvent> { - + /** * Default pattern string for log output. */ static final String DEFAULT_CONVERSION_PATTERN = "%date%thread%level%logger%mdc%msg"; + IThrowableRenderer throwableRenderer; + /** * Constructs a PatternLayout using the DEFAULT_LAYOUT_PATTERN. * @@ -50,7 +51,19 @@ throwableRenderer = new DefaultThrowableRenderer(); cssBuilder = new DefaultCssBuilder(); } - + + @Override + public void start() { + int errorCount = 0; + if (throwableRenderer == null) { + addError("ThrowableRender cannot be null."); + errorCount++; + } + if (errorCount == 0) { + super.start(); + } + } + protected Map<String, String> getDefaultConverterMap() { return PatternLayout.defaultConverterMap; } @@ -90,8 +103,8 @@ return buf.toString(); } - private void appendEventToBuffer(StringBuilder buf, Converter<LoggingEvent> c, - LoggingEvent event) { + private void appendEventToBuffer(StringBuilder buf, + Converter<LoggingEvent> c, LoggingEvent event) { buf.append("<td class=\""); buf.append(computeConverterName(c)); buf.append("\">"); @@ -99,4 +112,12 @@ buf.append("</td>"); buf.append(LINE_SEPARATOR); } + + public IThrowableRenderer getThrowableRenderer() { + return throwableRenderer; + } + + public void setThrowableRenderer(IThrowableRenderer throwableRenderer) { + this.throwableRenderer = throwableRenderer; + } } Modified: logback/trunk/logback-classic/src/test/input/joran/callerData.xml ============================================================================== --- logback/trunk/logback-classic/src/test/input/joran/callerData.xml (original) +++ logback/trunk/logback-classic/src/test/input/joran/callerData.xml Sun Dec 28 20:31:49 2008 @@ -12,7 +12,7 @@ </matcher> </evaluator> - <appender name="STR_LIST" class="ch.qos.logback.classic.StringListAppender"> + <appender name="STR_LIST" class="ch.qos.logback.classic.testUtil.StringListAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%caller{4, helloEval}%d %level - %m%n</Pattern> </layout> Added: logback/trunk/logback-classic/src/test/input/joran/conversionRule/htmlLayout0.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/conversionRule/htmlLayout0.xml Sun Dec 28 20:31:49 2008 @@ -0,0 +1,15 @@ +<configuration> + + <conversionRule conversionWord="sample" + converterClass="ch.qos.logback.classic.testUtil.SampleConverter" /> + + <appender name="LIST" class="ch.qos.logback.classic.testUtil.StringListAppender"> + <layout class="ch.qos.logback.classic.html.HTMLLayout"> + <Pattern>%sample%msg</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="LIST" /> + </root> +</configuration> \ No newline at end of file Added: logback/trunk/logback-classic/src/test/input/joran/conversionRule/patternLayout0.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/conversionRule/patternLayout0.xml Sun Dec 28 20:31:49 2008 @@ -0,0 +1,15 @@ +<configuration> + + <conversionRule conversionWord="sample" + converterClass="ch.qos.logback.classic.testUtil.SampleConverter" /> + + <appender name="LIST" class="ch.qos.logback.classic.testUtil.StringListAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%sample - %msg</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="LIST" /> + </root> +</configuration> \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java Sun Dec 28 20:31:49 2008 @@ -1,17 +1,18 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * 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-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.classic; import static ch.qos.logback.classic.TestConstants.ISO_REGEX; import static ch.qos.logback.classic.TestConstants.MAIN_REGEX; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -20,18 +21,24 @@ import org.junit.Before; import org.junit.Test; +import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.pattern.ConverterTest; import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.classic.testUtil.SampleConverter; +import ch.qos.logback.classic.testUtil.StringListAppender; +import ch.qos.logback.classic.util.TeztConstants; import ch.qos.logback.core.Context; +import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.pattern.PatternLayoutBase; import ch.qos.logback.core.pattern.parser.AbstractPatternLayoutBaseTest; public class PatternLayoutTest extends AbstractPatternLayoutBaseTest { - private PatternLayout pl = new PatternLayout(); private LoggerContext lc = new LoggerContext(); Logger logger = lc.getLogger(ConverterTest.class); + Logger root = lc.getLogger(LoggerContext.ROOT_NAME); + LoggingEvent le; List optionList = new ArrayList(); @@ -40,22 +47,23 @@ Exception ex = new Exception("Bogus exception"); le = makeLoggingEvent(ex); } - + @Before public void setUp() { pl.setContext(lc); } LoggingEvent makeLoggingEvent(Exception ex) { - return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class - .getName(), logger, Level.INFO, "Some message", ex, null); + return new LoggingEvent( + ch.qos.logback.core.pattern.FormattingConverter.class.getName(), + logger, Level.INFO, "Some message", ex, null); } @Override public LoggingEvent getEventObject() { return makeLoggingEvent(null); } - + public PatternLayoutBase getPatternLayoutBase() { return new PatternLayout(); } @@ -65,8 +73,10 @@ pl.setPattern("%d %le [%t] %lo{30} - %m%n"); pl.start(); String val = pl.doLayout(getEventObject()); - // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some message - String regex = ISO_REGEX+" INFO "+MAIN_REGEX+" c.q.l.c.pattern.ConverterTest - Some message\\s*"; + // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some + // message + String regex = ISO_REGEX + " INFO " + MAIN_REGEX + + " c.q.l.c.pattern.ConverterTest - Some message\\s*"; assertTrue(val.matches(regex)); } @@ -84,12 +94,13 @@ pl.setPattern("%-56(%d %lo{20}) - %m%n"); pl.start(); String val = pl.doLayout(getEventObject()); - // 2008-03-18 21:55:54,250 c.q.l.c.pattern.ConverterTest - Some message - String regex = ISO_REGEX+" c.q.l.c.p.ConverterTest - Some message\\s*"; + // 2008-03-18 21:55:54,250 c.q.l.c.pattern.ConverterTest - Some message + String regex = ISO_REGEX + + " c.q.l.c.p.ConverterTest - Some message\\s*"; assertTrue(val.matches(regex)); } - + @Test public void testNopExeptionHandler() { pl.setPattern("%nopex %m%n"); @@ -97,25 +108,27 @@ String val = pl.doLayout(le); assertTrue(!val.contains("java.lang.Exception: Bogus exception")); } - + @Test public void testWithParenthesis() { pl.setPattern("\\(%msg:%msg\\) %msg"); pl.start(); le = makeLoggingEvent(null); String val = pl.doLayout(le); - //System.out.println("VAL == " + val); + // System.out.println("VAL == " + val); assertEquals("(Some message:Some message) Some message", val); } - + @Test public void testWithLettersComingFromLog4j() { - //Letters: p = level and c = logger + // Letters: p = level and c = logger pl.setPattern("%d %p [%t] %c{30} - %m%n"); pl.start(); String val = pl.doLayout(getEventObject()); - // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some message - String regex = TestConstants.ISO_REGEX+" INFO "+MAIN_REGEX+" c.q.l.c.pattern.ConverterTest - Some message\\s*"; + // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some + // message + String regex = TestConstants.ISO_REGEX + " INFO " + MAIN_REGEX + + " c.q.l.c.pattern.ConverterTest - Some message\\s*"; assertTrue(val.matches(regex)); } @@ -127,9 +140,27 @@ String val = pl.doLayout(getEventObject()); assertEquals("aValue", val); } - + @Override public Context getContext() { return lc; } + + void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(lc); + jc.doConfigure(file); + } + + @Test + public void testConversionRuleSupportInPatternLayout() throws JoranException { + configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/conversionRule/patternLayout0.xml"); + root.getAppender("LIST"); + String msg = "Simon says"; + logger.debug(msg); + StringListAppender sla = (StringListAppender) root.getAppender("LIST"); + assertNotNull(sla); + assertEquals(1, sla.strList.size()); + assertEquals(SampleConverter.SAMPLE_STR+" - "+msg, sla.strList.get(0)); + } } 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 Sun Dec 28 20:31:49 2008 @@ -1,6 +1,7 @@ package ch.qos.logback.classic.html; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -20,16 +21,20 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.TestConstants; +import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.classic.spi.ThrowableDataPoint; import ch.qos.logback.classic.spi.ThrowableProxy; +import ch.qos.logback.classic.testUtil.StringListAppender; +import ch.qos.logback.classic.util.TeztConstants; import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.read.ListAppender; public class HTMLLayoutTest { LoggerContext lc; - Logger logger; + Logger root; HTMLLayout layout; @Before @@ -45,8 +50,8 @@ layout.setPattern("%level%thread%msg"); layout.start(); appender.setLayout(layout); - logger = lc.getLogger(LoggerContext.ROOT_NAME); - logger.addAppender(appender); + root = lc.getLogger(LoggerContext.ROOT_NAME); + root.addAppender(appender); appender.start(); } @@ -89,7 +94,8 @@ @Test public void testAppendThrowable() throws Exception { StringBuilder buf = new StringBuilder(); - ThrowableDataPoint[] strArray = { new ThrowableDataPoint("test1"), new ThrowableDataPoint("test2") }; + ThrowableDataPoint[] strArray = { new ThrowableDataPoint("test1"), + new ThrowableDataPoint("test2") }; DefaultThrowableRenderer renderer = (DefaultThrowableRenderer) layout .getThrowableRenderer(); renderer.render(buf, strArray); @@ -145,8 +151,7 @@ public void layoutWithException() throws Exception { layout.setPattern("%level %thread %msg %ex"); LoggingEvent le = createLoggingEvent(); - le.setThrowableProxy(new ThrowableProxy(new Exception( - "test Exception"))); + le.setThrowableProxy(new ThrowableProxy(new Exception("test Exception"))); String result = layout.doLayout(le); String stringToParse = layout.getFileHeader(); @@ -168,18 +173,19 @@ assertTrue(exceptionElement.getText().contains( "java.lang.Exception: test Exception")); } - + @Test @Ignore 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\">")); + 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 < CoreConstants.TABLE_ROW_LIMIT*3; i++) { - sb.append(layout.doLayout( new LoggingEvent(this.getClass().getName(), logger, - Level.DEBUG, "test message"+i, null, null))); + for (int i = 0; i < CoreConstants.TABLE_ROW_LIMIT * 3; i++) { + sb.append(layout.doLayout(new LoggingEvent(this.getClass().getName(), + root, Level.DEBUG, "test message" + i, null, null))); } sb.append(layout.getPresentationFooter()); sb.append(layout.getFileFooter()); @@ -188,7 +194,7 @@ } private LoggingEvent createLoggingEvent() { - LoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, + LoggingEvent le = new LoggingEvent(this.getClass().getName(), root, Level.DEBUG, "test message", null, null); return le; } @@ -200,4 +206,23 @@ reader.setEntityResolver(resolver); return reader.read(new ByteArrayInputStream(output.getBytes())); } + + void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(lc); + jc.doConfigure(file); + } + + @Test + public void testConversionRuleSupportInHtmlLayout() throws JoranException { + configure(TeztConstants.TEST_DIR_PREFIX + + "input/joran/conversionRule/htmlLayout0.xml"); + root.getAppender("LIST"); + String msg = "Simon says"; + root.debug(msg); + StringListAppender sla = (StringListAppender) root.getAppender("LIST"); + assertNotNull(sla); + assertEquals(1, sla.strList.size()); + assertFalse(sla.strList.get(0).contains("PARSER_ERROR")); + } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Sun Dec 28 20:31:49 2008 @@ -19,8 +19,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.StringListAppender; import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.classic.testUtil.StringListAppender; import ch.qos.logback.classic.turbo.DebugUsersTurboFilter; import ch.qos.logback.classic.turbo.NOPTurboFilter; import ch.qos.logback.classic.turbo.TurboFilter; Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/testUtil/SampleConverter.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/testUtil/SampleConverter.java Sun Dec 28 20:31:49 2008 @@ -0,0 +1,24 @@ +/** + * 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.classic.testUtil; + +import ch.qos.logback.classic.pattern.ClassicConverter; +import ch.qos.logback.classic.spi.LoggingEvent; + +public class SampleConverter extends ClassicConverter { + + static public final String SAMPLE_STR = "sample"; + + @Override + public String convert(LoggingEvent event) { + return SAMPLE_STR; + } + +} Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/testUtil/StringListAppender.java (from r2086, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/StringListAppender.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/StringListAppender.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/testUtil/StringListAppender.java Sun Dec 28 20:31:49 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.classic; +package ch.qos.logback.classic.testUtil; import java.util.ArrayList; import java.util.List; 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 Sun Dec 28 20:31:49 2008 @@ -1,7 +1,18 @@ +/** + * 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.html; +import java.util.HashMap; import java.util.Map; +import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreConstants; import static ch.qos.logback.core.CoreConstants.LINE_SEPARATOR; import ch.qos.logback.core.LayoutBase; @@ -12,7 +23,9 @@ import ch.qos.logback.core.pattern.parser.ScanException; /** - * This class is a base class for logback component-specific HTMLLayout classes + * This class is a base class for HTMLLayout classes part of + * other logback modules such as logback-classic and logback-access. + * * * @author Sébastien Pennec */ @@ -28,9 +41,7 @@ //this variable in their constructor to a default value. protected CssBuilder cssBuilder; - protected IThrowableRenderer throwableRenderer; //no more initialization ?????? - - // counter keeping track of the rows output + // counter keeping track of the rows output protected long counter = 0; /** @@ -64,16 +75,11 @@ public void start() { int errorCount = 0; - if (throwableRenderer == null) { - addError("ThrowableRender cannot be null."); - errorCount++; - } - try { Parser<E> p = new Parser<E>(pattern); p.setContext(getContext()); Node t = p.parse(); - this.head = p.compile(t, getDefaultConverterMap()); + this.head = p.compile(t, getEffectiveConverterMap()); ConverterUtil.startConverters(this.head); } catch (ScanException ex) { addError("Incorrect pattern found", ex); @@ -87,6 +93,33 @@ protected abstract Map<String, String> getDefaultConverterMap(); + + /** + * Returns a map where the default converter map is merged with the map + * contained in the context. + */ + public Map<String, String> getEffectiveConverterMap() { + Map<String, String> effectiveMap = new HashMap<String, String>(); + + // add the least specific map fist + Map<String, String> defaultMap = getDefaultConverterMap(); + if (defaultMap != null) { + effectiveMap.putAll(defaultMap); + } + + // contextMap is more specific than the default map + Context context = getContext(); + if (context != null) { + @SuppressWarnings("unchecked") + Map<String, String> contextMap = (Map<String, String>) context + .getObject(CoreConstants.PATTERN_RULE_REGISTRY); + if (contextMap != null) { + effectiveMap.putAll(contextMap); + } + } + return effectiveMap; + } + /** * The Title option takes a String value. This option sets the * document title of the generated HTML document. @@ -226,14 +259,4 @@ } } - public IThrowableRenderer getThrowableRenderer() { - return throwableRenderer; - } - - public void setThrowableRenderer(IThrowableRenderer throwableRenderer) { - this.throwableRenderer = throwableRenderer; - } - - - } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java Sun Dec 28 20:31:49 2008 @@ -1,7 +1,7 @@ /** - * LOGBack: the generic, reliable, fast and flexible logging framework. + * 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 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 Sun Dec 28 20:31:49 2008 @@ -1,11 +1,11 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * 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-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; @@ -22,15 +22,14 @@ import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.StatusManager; - abstract public class PatternLayoutBase<E> extends LayoutBase<E> { Converter<E> head; String pattern; protected PostCompileProcessor<E> postCompileProcessor; - + Map<String, String> instanceConverterMap = new HashMap<String, String>(); - + /** * Concrete implementations of this class are responsible for elaborating the * mapping between pattern words and converters. @@ -43,30 +42,27 @@ * Returns a map where the default converter map is merged with the map * contained in the context. */ - @SuppressWarnings("unchecked") public Map<String, String> getEffectiveConverterMap() { - Map<String, String> effectiveMap = new HashMap<String, String>(); - // add the least specific map fist Map<String, String> defaultMap = getDefaultConverterMap(); if (defaultMap != null) { effectiveMap.putAll(defaultMap); } - + // contextMap is more specific than the default map Context context = getContext(); if (context != null) { - Map<String, String> contextMap = (Map) context.getObject(CoreConstants.PATTERN_RULE_REGISTRY); + @SuppressWarnings("unchecked") + Map<String, String> contextMap = (Map<String, String>) context + .getObject(CoreConstants.PATTERN_RULE_REGISTRY); if (contextMap != null) { effectiveMap.putAll(contextMap); } } - // set the most specific map last effectiveMap.putAll(instanceConverterMap); - return effectiveMap; } @@ -78,7 +74,7 @@ } Node t = p.parse(); this.head = p.compile(t, getEffectiveConverterMap()); - if(postCompileProcessor != null) { + if (postCompileProcessor != null) { postCompileProcessor.process(head); } setContextForConverters(head); @@ -95,7 +91,7 @@ PostCompileProcessor<E> postCompileProcessor) { this.postCompileProcessor = postCompileProcessor; } - + protected void setContextForConverters(Converter<E> head) { Context context = getContext(); Converter c = head; Modified: logback/trunk/logback-examples/src/main/java/chapter6/GoMDC.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter6/GoMDC.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter6/GoMDC.java Sun Dec 28 20:31:49 2008 @@ -1,4 +1,4 @@ -package chapter5; +package chapter6; import org.slf4j.Logger; import org.slf4j.LoggerFactory;

1 0