December 2008 - logback-dev

[JIRA] Closed: (LBGENERAL-19) PatternLayout where I can show just the
by Ceki Gulcu (JIRA) 29 Dec '08

29 Dec '08

PatternLayout needs to be able to show class name of the logger without it's package prefix In-Reply-To: <1709934225.1212671531314.JavaMail.ceki@pixie> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk [ http://jira.qos.ch/browse/LBGENERAL-19?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu closed LBGENERAL-19. ------------------------------- > PatternLayout where I can show just the PatternLayout needs to be able to show class name of the logger without it's package prefix > ------------------------------------------------------------------------------------------------------------------------------------- > > Key: LBGENERAL-19 > URL: http://jira.qos.ch/browse/LBGENERAL-19 > Project: logback-general > Issue Type: New Feature > Affects Versions: unspecified > Environment: All > Reporter: Arthur Blake > Assignee: Logback dev list > Priority: Minor > Fix For: 0.9.13 > > > It would be very useful to have an option in the PatternLayout to show *only* the class name without it's package prefix. > See: > http://marc.info/?l=logback-user&m=118417765316898&w=2 > and > http://marc.info/?l=logback-user&m=121266617228638&w=2 -- 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: (LBGENERAL-19) PatternLayout where I can show just the
by Ceki Gulcu (JIRA) 29 Dec '08

29 Dec '08

PatternLayout needs to be able to show class name of the logger without it's package prefix In-Reply-To: <1709934225.1212671531314.JavaMail.ceki@pixie> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk [ http://jira.qos.ch/browse/LBGENERAL-19?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu resolved LBGENERAL-19. --------------------------------- Fix Version/s: 0.9.13 Resolution: Fixed Hello Arthur, This issue has been fixed in logback 0.9.13. Here is the documentation http://logback.qos.ch/manual/layouts.html#conversionWord For exact details see http://svn.qos.ch/viewvc?view=rev&revision=1967 > PatternLayout where I can show just the PatternLayout needs to be able to show class name of the logger without it's package prefix > ------------------------------------------------------------------------------------------------------------------------------------- > > Key: LBGENERAL-19 > URL: http://jira.qos.ch/browse/LBGENERAL-19 > Project: logback-general > Issue Type: New Feature > Affects Versions: unspecified > Environment: All > Reporter: Arthur Blake > Assignee: Logback dev list > Priority: Minor > Fix For: 0.9.13 > > > It would be very useful to have an option in the PatternLayout to show *only* the class name without it's package prefix. > See: > http://marc.info/?l=logback-user&m=118417765316898&w=2 > and > http://marc.info/?l=logback-user&m=121266617228638&w=2 -- 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: (LBCLASSIC-85) Multiply logback.xml files on the classpath, the first one will be used without notification
by Szel Zoltan (JIRA) 29 Dec '08

29 Dec '08

Multiply logback.xml files on the classpath, the first one will be used without notification -------------------------------------------------------------------------------------------- Key: LBCLASSIC-85 URL: http://jira.qos.ch/browse/LBCLASSIC-85 Project: logback-classic Issue Type: Bug Components: Other Affects Versions: 0.9.11 Reporter: Szel Zoltan Assignee: Logback dev list Hi all, i have hit this issue a couple of times now, so i go ahead and rise it. We are creating libraries to our developers, which are usually have an example part, where they can try our piece of software out. These examples are part of our Eclipse project. All these examples have a logback.xml file to show how a complete application should look like. During development, this causes some issues because the first one in the classpath will be loaded, so i ended up to use the manual config loading via Joran, but it took me some time to figure out the root cause of the issue. I imagine, this will cause issues when developers will start to bundle there logback.xml file into there jars. Could the ContextInitializer be changed to detect such a scenario and report it? The change is fairly easy, instead of using the getResource(String name) function from the ClassLoader class, you could go with the getResources(String name) function, check if it returned more than one element, than report to the Status manager the fact, that there are more than 1 logback.xml file on the classpath and the first one will be used. Thanks in advance, Kind Regards, Zoltan Szel -- 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 2

svn commit: r2111 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/selector logback-classic/src/main/java/ch/qos/logback/classic/util logback-classic/src/main/java/org/slf4j/impl logback-classic/src/test/java/org/slf4j/impl logback-core/src/main/java/ch/qos/logback/core/util logback-examples/src/main/java/chapter3 logback-examples/src/main/java/chapter4/mail logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 29 Dec '08

29 Dec '08

Author: ceki Date: Mon Dec 29 17:30:39 2008 New Revision: 2111 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java logback/trunk/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java logback/trunk/logback-examples/src/main/java/chapter3/MyApp3.java logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java logback/trunk/logback-site/src/site/pages/manual/appenders.html logback/trunk/logback-site/src/site/pages/manual/joran.html logback/trunk/logback-site/src/site/pages/news.html Log: - Logback-classic default configration process will now automatically print status data on the console in case of warnings as well as errors. Previously, status data was printed only in case of errors. - In case multiple configuration files are found on the class path, ContextInitializer will now emit a warning. This fixes LBCLASSIC-85. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java Mon Dec 29 17:30:39 2008 @@ -105,7 +105,7 @@ } catch (JoranException je) { } } - StatusPrinter.printIfErrorsOccured(loggerContext); + StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext); } return loggerContext; } @@ -157,7 +157,7 @@ configurator.doConfigure(url); } catch (JoranException e) { } - StatusPrinter.printIfErrorsOccured(context); + StatusPrinter.printInCaseOfErrorsOrWarnings(context); } public List<String> getContextNames() { 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 Mon Dec 29 17:30:39 2008 @@ -1,15 +1,19 @@ package ch.qos.logback.classic.util; import java.io.File; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.util.List; import ch.qos.logback.classic.BasicConfigurator; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.status.WarnStatus; import ch.qos.logback.core.util.Loader; import ch.qos.logback.core.util.OptionHelper; @@ -43,8 +47,9 @@ configurator.doConfigure(url); } - private URL findConfigFileURLFromSystemProperties(boolean updateStatus) { + private URL findConfigFileURLFromSystemProperties(ClassLoader classLoader, boolean updateStatus) { String logbackConfigFile = OptionHelper.getSystemProperty(CONFIG_FILE_PROPERTY); + if (logbackConfigFile != null) { URL result = null; try { @@ -53,7 +58,7 @@ } catch (MalformedURLException e) { // so, resource is not a URL: // attempt to get the resource from the class path - result = Loader.getResourceBySelfClassLoader(logbackConfigFile); + result = Loader.getResource(logbackConfigFile, classLoader); if (result != null) { return result; } @@ -67,7 +72,7 @@ } } finally { if (updateStatus) { - statusOnResourceSearch(logbackConfigFile, result); + statusOnResourceSearch(logbackConfigFile, classLoader, result); } } } @@ -75,22 +80,23 @@ } public URL findURLOfDefaultConfigurationFile(boolean updateStatus) { - URL url = findConfigFileURLFromSystemProperties(updateStatus); + ClassLoader myClassLoader = this.getClass().getClassLoader(); + URL url = findConfigFileURLFromSystemProperties(myClassLoader, updateStatus); if (url != null) { return url; } - url = Loader.getResource(TEST_AUTOCONFIG_FILE, this.getClass().getClassLoader()); + url = Loader.getResource(TEST_AUTOCONFIG_FILE, myClassLoader); if (updateStatus) { - statusOnResourceSearch(TEST_AUTOCONFIG_FILE, url); + statusOnResourceSearch(TEST_AUTOCONFIG_FILE, myClassLoader, url); } if (url != null) { return url; } - url = Loader.getResource(AUTOCONFIG_FILE, this.getClass().getClassLoader()); + url = Loader.getResource(AUTOCONFIG_FILE, myClassLoader); if (updateStatus) { - statusOnResourceSearch(AUTOCONFIG_FILE, url); + statusOnResourceSearch(AUTOCONFIG_FILE, myClassLoader, url); } return url; } @@ -105,7 +111,26 @@ } } - private void statusOnResourceSearch(String resourceName, URL url) { + private void multiplicityWarning(String resourceName, ClassLoader classLoader ) { + List<URL> urlList = null; + StatusManager sm = loggerContext.getStatusManager(); + try { + urlList = Loader.getResourceOccurenceCount(resourceName, classLoader); + } catch (IOException e) { + sm.add(new ErrorStatus("Failed to get url list for resource [" + resourceName + "]", + loggerContext, e)); + } + if(urlList != null && urlList.size() > 1) { + sm.add(new WarnStatus("Resource [" + resourceName + "] occurs multiple times on the classpath.", + loggerContext)); + for(URL url: urlList) { + sm.add(new WarnStatus("Resource ["+resourceName+"] occurs at ["+url.toString()+"]", + loggerContext)); + } + } + } + + private void statusOnResourceSearch(String resourceName, ClassLoader classLoader, URL url) { StatusManager sm = loggerContext.getStatusManager(); if (url == null) { sm.add(new InfoStatus("Could NOT find resource [" + resourceName + "]", @@ -113,6 +138,7 @@ } else { sm.add(new InfoStatus("Found resource [" + resourceName + "] at ["+url.toString()+"]", loggerContext)); + multiplicityWarning(resourceName, classLoader); } } Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (original) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Mon Dec 29 17:30:39 2008 @@ -87,7 +87,7 @@ Util.reportFailure("Failed to auto configure default logger context", je); } - StatusPrinter.printIfErrorsOccured(defaultLoggerContext); + StatusPrinter.printInCaseOfErrorsOrWarnings(defaultLoggerContext); // See if a special context selector is needed String contextSelectorStr = OptionHelper Modified: logback/trunk/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java Mon Dec 29 17:30:39 2008 @@ -43,7 +43,7 @@ LoggerContext loggerContext = (LoggerContext) LoggerFactory .getILoggerFactory(); - StatusPrinter.printIfErrorsOccured(loggerContext); + StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext); StatusManager sm = loggerContext.getStatusManager(); assertEquals("Was expecting no errors", Status.WARN, sm.getLevel()); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java Mon Dec 29 17:30:39 2008 @@ -9,7 +9,11 @@ */ package ch.qos.logback.core.util; +import java.io.IOException; import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; import ch.qos.logback.core.Context; @@ -35,6 +39,27 @@ } /** + * Compute the number of occurrences a resource can be found by a class + * loader. + * + * @param resource + * @param classLoader + * @return + * @throws IOException + */ + public static List<URL> getResourceOccurenceCount(String resource, + ClassLoader classLoader) throws IOException { + List<URL> urlList = new ArrayList<URL>(); + Enumeration<URL> urlEnum = classLoader.getResources(resource); + while (urlEnum.hasMoreElements()) { + URL url = urlEnum.nextElement(); + urlList.add(url); + } + + return urlList; + } + + /** * Search for a resource using the classloader passed as parameter. * * @param resource @@ -61,9 +86,9 @@ return getResource(resource, Loader.class.getClassLoader()); } -// private static URL getResourceByTCL(String resource) { -// return getResource(resource, getTCL()); -// } + // private static URL getResourceByTCL(String resource) { + // return getResource(resource, getTCL()); + // } /** * Get the Thread Context Loader which is a JDK 1.2 feature. If we are running Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Mon Dec 29 17:30:39 2008 @@ -33,6 +33,28 @@ public static void setPrintStream(PrintStream printStream) { ps = printStream; } + + /** + * Print the contents of the context statuses, but only if they contain + * warnings or errors. + * + * @param context + */ + public static void printInCaseOfErrorsOrWarnings(Context context) { + if (context == null) { + throw new IllegalArgumentException("Context argument cannot be null"); + } + + StatusManager sm = context.getStatusManager(); + if (sm == null) { + ps.println("WARN: Context named \"" + context.getName() + + "\" has no status manager"); + } else { + if (sm.getLevel() == ErrorStatus.WARN) { + print(sm); + } + } + } /** * Print the contents of the context statuses, but only if they contain Modified: logback/trunk/logback-examples/src/main/java/chapter3/MyApp3.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter3/MyApp3.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter3/MyApp3.java Mon Dec 29 17:30:39 2008 @@ -38,7 +38,7 @@ } catch (JoranException je) { je.printStackTrace(); } - StatusPrinter.printIfErrorsOccured(lc); + StatusPrinter.printInCaseOfErrorsOrWarnings(lc); logger.info("Entering application."); 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 Mon Dec 29 17:30:39 2008 @@ -38,7 +38,7 @@ lc.reset(); configurator.setContext(lc); configurator.doConfigure(configFile); - StatusPrinter.printIfErrorsOccured(lc); + StatusPrinter.printInCaseOfErrorsOrWarnings(lc); Logger logger = LoggerFactory.getLogger(EMail.class); @@ -52,7 +52,7 @@ logger.error("At last an error.", new Exception("Just testing")); - StatusPrinter.printIfErrorsOccured(lc); + StatusPrinter.printInCaseOfErrorsOrWarnings(lc); } static void usage(String msg) { 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 Mon Dec 29 17:30:39 2008 @@ -3112,9 +3112,12 @@ href="#SiftingAppender">SiftingAppender</a></h3> As its name implies, a <code>SiftingAppender</code> can be used - to separate (or sift) logging according to some runtime attribute. - For example, <code>SiftingAppender</code> can separate logging - events into distinct log files, one file per user. + to separate (or sift) logging according to a given runtime + attribute. For example, <code>SiftingAppender</code> can separate + logging events according to user sessions, so that the logs + generated by every user go into distinct log files, one log file + per user. For example, <code>SiftingAppender</code> can separate + logging events into distinct log files, one file per user. Modified: logback/trunk/logback-site/src/site/pages/manual/joran.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/joran.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/joran.html Mon Dec 29 17:30:39 2008 @@ -233,14 +233,15 @@ directory accessible from the class path. Running the MyApp1 application should give identical results to its previous run. - If and only if there are errors during the parsing of the - configuration file, logback will automatically print status data on - the console. In the absence of errors, if you still wish to inspect - logback's internal status, then you can instruct logback to print - status data by invoking the <code>print()</code> of the - <code>StatusPrinter</code> class. The MyApp2 application - shown below is identical to MyApp1 except the addition of - two lines of code for printing internal status data. + If and only if there are warnings or errors during the parsing + of the configuration file, logback will automatically print status + data on the console. In the absence of warnings or errors, if you + still wish to inspect logback's internal status, then you can + instruct logback to print status data by invoking the + <code>print()</code> of the <code>StatusPrinter</code> class. The + MyApp2 application shown below is identical to + MyApp1 except the addition of two lines of code for + printing internal status data. Example 3.: Print logback's internal status information <a @@ -347,12 +348,12 @@ Logback relies on a configuration library called Joran which is part of logback-core. Logback's default configuration mechanism - invokes JoranConfigurator on the default configuration files it - finds on the class path. For whatever reason if you wish to + invokes <code>JoranConfigurator</code> on the default configuration + file it finds on the class path. For whatever reason if you wish to override logback's default configuration mechanism, you can do so - by invoking JoranConfigurator directly. The next application, - MyApp3, invokes JoranConfigurator on a configuration file - passed as parameter. + by invoking <code>JoranConfigurator</code> directly. The next + application, MyApp3, invokes JoranConfigurator on a + configuration file passed as parameter. Example 3.: Invoking <code>JoranConfigurator</code> directly <a @@ -385,7 +386,7 @@ } catch (JoranException je) { je.printStackTrace(); } - StatusPrinter.printIfErrorsOccured(lc); + StatusPrinter.printInCaseOfErrorsOrWarnings(lc); logger.info("Entering application."); @@ -395,13 +396,14 @@ } }</pre></div> - This application fetches the <code>LoggerContext</code> currently - in effect, creates a new <code>JoranConfigurator</code>, sets the - context on which it will operate, resets the logger context, and - then finally asks the configurator to configure the context using - configuration file passed as parameter to the application. Internal - status data is printed in case errors occur. - + This application fetches the <code>LoggerContext</code> + currently in effect, creates a new <code>JoranConfigurator</code>, + sets the context on which it will operate, resets the logger + context, and then finally asks the configurator to configure the + context using configuration file passed as parameter to the + application. Internal status data is printed in case of warnings or + errors. + <h3> <a name="statusListener" href="#statusListener">Listening to 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 Mon Dec 29 17:30:39 2008 @@ -47,6 +47,15 @@ a turbo filter which detects duplicate messages, and beyond a certain number of repetitions, drops repeated messages. + Added a new appender called <a + href="manual/appenders.html#SiftingAppender"><code>SiftingAppender</code></a>. As + its name intimates, a <code><code>SiftingAppender</code></code> + can be used to separate (or sift) logging according to a given + runtime attribute. For example, <code>SiftingAppender</code> can + separate logging events according to user sessions, so that the + logs generated by each user go into distinct log files, one log + file per user. + <code>BasicStatusManager</code>'s internal buffer is now split into two parts, the header part and the tail part. The header part @@ -73,26 +82,50 @@ <code>JaninoEvaluator</code>. + Logback-classic default configuration process will now + automatically print status data on the console in case of warnings + as well as errors. Previously, status data was printed only in + case of errors. + <code>ContextInitializer</code> will now print the url of the - configration it is using. This should help reduce confusion when + configuration it is using. This should help reduce confusion when multiple config files are found on the class path. This change resolves <a href="http://jira.qos.ch/browse/LBCLASSIC-55">LBCLASSIC-55</a> reported by Anton Tagunov and Henric Larsson. + In case multiple configuration files are found on the class + path, <code>ContextInitializer</code> will now emit a + warning. This fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-85">LBCLASSIC-85</a> + filed by Szel Zoltan. + + <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. + Fixed <a + href="http://jira.qos.ch/browse/LBCORE-69">LBCORE-69</a> as + reported by Andrey Rybin. <code>SMTPAppenderBase</code> now has + support for charset encodings so that email messages can contain + characters beyond US-ASCII. + - - SMTPAppender im logback-classic now defaults to + <code>SMTPAppender</code> in 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. + Added UnsynchronizedAppenderBase class based on Ralph Goers' + contribution in <a + href="http://jira.qos.ch/browse/LBCORE-58">LBCORE-58</a>. Note + that <code>AppenderBase</code> remains unchanged. Appenders which + need to handle synchronization on their own can do so by deriving + from <code>UnsynchronizedAppenderBase</code>. + <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-69) SMTPAppenderBase: Allow to select charset encoding for email's subject and body
by Andrey Rybin (JIRA) 29 Dec '08

29 Dec '08

SMTPAppenderBase: Allow to select charset encoding for email's subject and body ------------------------------------------------------------------------------- Key: LBCORE-69 URL: http://jira.qos.ch/browse/LBCORE-69 Project: logback-core Issue Type: Improvement Components: Appender Reporter: Andrey Rybin Assignee: Logback dev list Please add String charsetEncoding property to SMTPAppenderBase and use it for email's subject and content encoding. Now javaMail default charset encoding is used so only ASCII latin characters can be used in log messages. For example my fix for log4j SMTPAppender: + private String charsetEncoding = "UTF-8"; public void activateOptions () { .. addressMessage(msg); if (getSubject() != null) { ((MimeMessage)msg).setSubject(getSubject(), charsetEncoding); //fix1. Cast looks ugly, but as we always create MimeMessage above, it's ok } /*** Send the contents of the cyclic buffer as an e-mail message. */ @Override protected void sendBuffer () { /* Note: this code already owns the monitor for this appender. This frees us from needing to synchronize on 'cb'. */ try { final MimeBodyPart part = new MimeBodyPart(); final StringBuilder sb = new StringBuilder(); String t = layout.getHeader(); if (t != null) { sb.append(t); } //add header final int len = cb.length(); for (int i = 0; i < len; i++) { final LoggingEvent event = cb.get(); sb.append(layout.format(event)); if (layout.ignoresThrowable()) { final String[] s = event.getThrowableStrRep(); if (s != null) { for (int j = 0; j < s.length; j++) { sb.append(s[j]).append(Layout.LINE_SEP); }//for }//if }//if }//for t = layout.getFooter(); if (t != null) { sb.append(t); } //fix2: t = layout.getContentType(); if (t.startsWith("text/")) { part.setText(sb.toString(), charsetEncoding, t.substring(5)); //remove 'text/' from contentType cause javaMail needs here only subtype (html, plain, etc) } else { part.setContent(sb.toString(), t); //for non text chartset isn't needed }//if final Multipart mp = new MimeMultipart(); mp.addBodyPart(part); msg.setContent(mp); msg.setSentDate(new Date()); Transport.send(msg); } catch (Exception e) { LogLog.error("sendBuffer: Error occured while sending e-mail notification from "+getFrom()+" to "+getTo(), e); }//try }//sendBuffer -- 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 2

svn commit: r2110 - in logback/trunk: logback-core/src/main/java/ch/qos/logback/core/net logback-core/src/main/java/ch/qos/logback/core/util logback-core/src/test/java/ch/qos/logback/core/util logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 29 Dec '08

29 Dec '08

Author: ceki Date: Mon Dec 29 15:07:56 2008 New Revision: 2110 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/ContentTypeUtil.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/ContentTypeUtilTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/PackageTest.java logback/trunk/logback-site/src/site/pages/manual/appenders.html Log: - add charset encoding support for SMTPAppenderBase. This fixes LBCORE-69. 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 Mon Dec 29 15:07:56 2008 @@ -30,8 +30,12 @@ import ch.qos.logback.core.Layout; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.boolex.EventEvaluator; +import ch.qos.logback.core.util.ContentTypeUtil; import ch.qos.logback.core.util.OptionHelper; +// Contributors: +// Andrey Rybin charset encoding support http://jira.qos.ch/browse/LBCORE-69 + /** * An abstract class that provides support for sending events to an email * address. @@ -41,7 +45,6 @@ * * @author Ceki Gülcü * @author Sébastien Pennec - * */ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { @@ -59,7 +62,9 @@ String username; String password; - protected Message msg; + private String charsetEncoding = "UTF-8"; + + protected MimeMessage mimeMsg; protected EventEvaluator<E> eventEvaluator; @@ -109,16 +114,16 @@ // props.put("mail.debug", "true"); Session session = Session.getInstance(props, loginAuthenticator); - msg = new MimeMessage(session); + mimeMsg = new MimeMessage(session); try { if (from != null) { - msg.setFrom(getAddress(from)); + mimeMsg.setFrom(getAddress(from)); } else { - msg.setFrom(); + mimeMsg.setFrom(); } - msg.setRecipients(Message.RecipientType.TO, parseAddress(to)); + mimeMsg.setRecipients(Message.RecipientType.TO, parseAddress(to)); subjectLayout = makeSubjectLayout(subjectStr); @@ -166,7 +171,7 @@ return false; } - if (this.msg == null) { + if (this.mimeMsg == null) { addError("Message object not configured."); return false; } @@ -254,17 +259,25 @@ } if (subjectLayout != null) { - msg.setSubject(subjectLayout.doLayout(lastEventObject)); + mimeMsg.setSubject(subjectLayout.doLayout(lastEventObject), + charsetEncoding); } - part.setContent(sbuf.toString(), layout.getContentType()); + String contentType = layout.getContentType(); + + if (ContentTypeUtil.isTextual(contentType)) { + part.setText(sbuf.toString(), charsetEncoding, ContentTypeUtil + .getSubType(contentType)); + } else { + part.setContent(sbuf.toString(), layout.getContentType()); + } Multipart mp = new MimeMultipart(); mp.addBodyPart(part); - msg.setContent(mp); + mimeMsg.setContent(mp); - msg.setSentDate(new Date()); - Transport.send(msg); + mimeMsg.setSentDate(new Date()); + Transport.send(mimeMsg); } catch (Exception e) { addError("Error occured while sending e-mail notification.", e); } @@ -344,12 +357,12 @@ // for testing purpose only public Message getMessage() { - return msg; + return mimeMsg; } // for testing purpose only - public void setMessage(Message msg) { - this.msg = msg; + public void setMessage(MimeMessage msg) { + this.mimeMsg = msg; } public boolean isSTARTTLS() { @@ -402,4 +415,22 @@ this.password = password; } + /** + * @see #setCharsetEncoding(String) + * @return the charset encoding value + */ + String getCharsetEncoding() { + return charsetEncoding; + } + + /** + * Set the character set encoding of the outgoing email messages. The default + * encoding is "UTF-8" which usually works well for most purposes. + * + * @param charsetEncoding + */ + void setCharsetEncoding(String charsetEncoding) { + this.charsetEncoding = charsetEncoding; + } + } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/ContentTypeUtil.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/ContentTypeUtil.java Mon Dec 29 15:07:56 2008 @@ -0,0 +1,43 @@ +/** + * 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.util; + +/** + * Various utility methods for processing strings representing context types. + * + * @author Ceki Gulcu + * + */ +public class ContentTypeUtil { + + public static boolean isTextual(String contextType) { + if (contextType == null) { + return false; + } + return contextType.startsWith("text"); + } + + public static String getSubType(String contextType) { + if (contextType == null) { + return null; + } + int index = contextType.indexOf('/'); + if (index == -1) { + return null; + } else { + int subTypeStartIndex = index + 1; + if (subTypeStartIndex < contextType.length()) { + return contextType.substring(subTypeStartIndex); + } else { + return null; + } + } + } +} Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/ContentTypeUtilTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/ContentTypeUtilTest.java Mon Dec 29 15:07:56 2008 @@ -0,0 +1,40 @@ +/** + * 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.util; + +import static org.junit.Assert.*; + +import org.junit.Test; + + +public class ContentTypeUtilTest { + + + @Test + public void smoke() { + String contextType = "text/html"; + assertTrue(ContentTypeUtil.isTextual(contextType)); + assertEquals("html", ContentTypeUtil.getSubType(contextType)); + } + + @Test + public void nullContext() { + String contextType = null; + assertFalse(ContentTypeUtil.isTextual(contextType)); + assertNull(ContentTypeUtil.getSubType(contextType)); + } + + @Test + public void emptySubtype() { + String contextType = "text/"; + assertTrue(ContentTypeUtil.isTextual(contextType)); + assertNull(ContentTypeUtil.getSubType(contextType)); + } +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/PackageTest.java Mon Dec 29 15:07:56 2008 @@ -20,6 +20,7 @@ FileUtilTest.class, OptionHelperTest.class, StatusPrinterTest.class, - TimeUtilTest.class}) + TimeUtilTest.class, + ContentTypeUtilTest.class}) public class PackageTest { } 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 Mon Dec 29 15:07:56 2008 @@ -1994,6 +1994,7 @@ <th>Type</th> <th>Description</th> </tr> + <tr> <td>SMTPHost</td> <td><code>String</code></td> @@ -2124,6 +2125,18 @@ </td> </tr> + <tr class="alt"> + <td>CharsetEncoding</td> + <td><code>String</code></td> + <td>The outgoing email message will be encoded in the + designated <a + href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">charset</a>. The + default charset encoding is "UTF-8" which works well for most + purposes. + </td> + </tr> + + </table> The SMTPAppender keeps only the last <span

1 0

svn commit: r2109 - in logback/trunk: logback-classic/src/main/java/org/slf4j/impl logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 28 Dec '08

28 Dec '08

Author: ceki Date: Sun Dec 28 21:22:44 2008 New Revision: 2109 Removed: logback/trunk/logback-site/src/site/pages/manual/contextSelector.html Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java logback/trunk/logback-site/src/site/pages/manual/loggingSeparation.html logback/trunk/logback-site/src/site/pages/news.html Log: Documentation enhancements. Closing LBCLASSIC-30 Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (original) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Sun Dec 28 21:22:44 2008 @@ -51,24 +51,23 @@ * The unique instance of this class. */ private static StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); - + static { SINGLETON.init(); } - + private boolean initialized = false; private LoggerContext defaultLoggerContext = new LoggerContext(); private ContextSelector contextSelector; - private StaticLoggerBinder() { defaultLoggerContext.setName(CoreConstants.DEFAULT_CONTEXT_NAME); } public static StaticLoggerBinder getSingleton() { - return SINGLETON; + return SINGLETON; } - + /** * Package access for testing purposes. */ @@ -76,7 +75,7 @@ SINGLETON = new StaticLoggerBinder(); SINGLETON.init(); } - + /** * Package access for testing purposes. */ @@ -110,6 +109,21 @@ } } + /** + * Intantiate the context selector class designated by the user. The selector + * must have a constructor taking a LoggerContext instance as an argument. + * + * @param defaultLoggerContext + * @param contextSelectorStr + * @return an instance of the designated context selector class + * @throws ClassNotFoundException + * @throws SecurityException + * @throws NoSuchMethodException + * @throws IllegalArgumentException + * @throws InstantiationException + * @throws IllegalAccessException + * @throws InvocationTargetException + */ static ContextSelector dynamicalContextSelector( LoggerContext defaultLoggerContext, String contextSelectorStr) throws ClassNotFoundException, SecurityException, NoSuchMethodException, @@ -122,10 +136,10 @@ } public ILoggerFactory getLoggerFactory() { - if(!initialized) { + if (!initialized) { return defaultLoggerContext; } - + if (contextSelector == null) { throw new IllegalStateException( "contextSelector cannot be null. See also " + NULL_CS_URL); Modified: logback/trunk/logback-site/src/site/pages/manual/loggingSeparation.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/loggingSeparation.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/loggingSeparation.html Sun Dec 28 21:22:44 2008 @@ -155,6 +155,12 @@ -Dlogback.ContextSelector=myPackage.myContextSelector + The context selector needs to implement the + <code>ContextSelector</code> interface and have a constructor + method admitting a <code>LoggerContext</code> instance as its only + parameter. + + <h3>ContextJNDISelector</h3> 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 21:22:44 2008 @@ -73,11 +73,21 @@ <code>JaninoEvaluator</code>. + <code>ContextInitializer</code> will now print the url of the + configration it is using. This should help reduce confusion when + multiple config files are found on the class path. This change + resolves <a + href="http://jira.qos.ch/browse/LBCLASSIC-55">LBCLASSIC-55</a> + reported by Anton Tagunov and Henric Larsson. + + <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

1 0

[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