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

svn commit: r462 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 14 Aug '06

14 Aug '06

Author: seb Date: Mon Aug 14 20:44:19 2006 New Revision: 462 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Log: improved a test Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Mon Aug 14 20:44:19 2006 @@ -113,10 +113,16 @@ public void testStatusWithUnconfiguredContext() { Logger logger = lc.getLogger(LoggerContextTest.class); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 3; i++) { logger.debug("test"); } + logger = lc.getLogger("x.y.z"); + + for (int i = 0; i < 3; i++) { + logger.debug("test"); + } + StatusManager sm = lc.getStatusManager(); assertTrue("StatusManager has recieved too many messages", sm.getCount() == 1); }

1 0

svn commit: r461 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 11 Aug '06

11 Aug '06

Author: seb Date: Fri Aug 11 19:03:04 2006 New Revision: 461 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Log: - added a test case to be sure that the LoggerContext doesn't get flooded with messages when no appenders are configured related bug: id=2 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java Fri Aug 11 19:03:04 2006 @@ -9,10 +9,8 @@ */ package ch.qos.logback.classic; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.LoggerContext; -import junit.framework.*; +import junit.framework.TestCase; +import ch.qos.logback.core.status.StatusManager; public class LoggerContextTest extends TestCase { LoggerContext lc; @@ -111,5 +109,16 @@ LoggerTestHelper.assertLevels(null, lc.getLogger("w.x.y"), Level.INFO); LoggerTestHelper.assertLevels(null, wxyz, Level.INFO); } + + public void testStatusWithUnconfiguredContext() { + Logger logger = lc.getLogger(LoggerContextTest.class); + + for (int i = 0; i < 10; i++) { + logger.debug("test"); + } + + StatusManager sm = lc.getStatusManager(); + assertTrue("StatusManager has recieved too many messages", sm.getCount() == 1); + } } \ No newline at end of file

1 0

svn commit: r460 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 11 Aug '06

11 Aug '06

Author: seb Date: Fri Aug 11 11:31:45 2006 New Revision: 460 Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml Log: - updated bugreport.xml introduction - spelling fix on documentation.xml Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml Fri Aug 11 11:31:45 2006 @@ -2,13 +2,60 @@ <document> <body> - <h2>Bug reporting</h2> +<h2>Before you report a bug</h2> - <p>The logback project uses a bugzilla based management system to - track bugs.</p> +<p> +The logback community consists of those who use logback and its modules, +help answer questions on discussions lists, contribute documentation and patches, +and those who develop and maintain the code for logback and its modules. +Almost all those who assist on a day to day basis resolving bug reports do this for +a wide variety of reasons, and almost all of them do this on their own time. +</p> +<p> +Many bugs reported end up not being a bug in logback, but are due to misconfiguration, +problems caused by installed applications, the operating system, etc. +</p> +<p> +Before reporting a bug please make every effort to resolve the problem yourself. +Just reporting a bug will not fix it. A good bug report includes a detailed description +of the problem and a succinct test case which can reproduce the problem. +</p> - <p>You can report and follow logback bugs by following <a - href="http://bugzilla.qos.ch/">this link</a>.</p> +<h3>Review the documentation</h3> +<p> +Review the documentation for the version of component you are using. +The problem you are having may already be addressed in the docs. +</p> + +<h3>Search the mailing list archives</h3> +<p> +It is very likely you are not the first to run into a problem. +Others may have already found a solution. +Our various mailing lists are likely to have discussed this problem before. +</p> + +<h3>Search Bugzilla</h3> + +<p> +Please search the bug database to see if the bug you are seeing has already been reported. +The bug may have already been fixed and is available in a later version. +If someone else has reported the same bug, you could add supporting information to help reproduce and resolve the bug. +</p> +<ul> + <li><a href="http://bugzilla.qos.ch/query.cgi">Search for logback bugs</a></li> +</ul> + +<h2>Reporting with Bugzilla</h2> +<p> +Only after you have exhausted the aforementioned steps, should you file a formal report in bugzilla. +</p> +<p> +Please make sure you provide as much information as possible. +Its very hard to fix a bug if the person looking into the problem can't reproduce it. +</p> +<ul> + <li><a href="http://bugzilla.qos.ch/enter_bug.cgi">Report new logback bug</a></li> +</ul> Modified: logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml Fri Aug 11 11:31:45 2006 @@ -3,7 +3,7 @@ <properties> <author email="ceki at qos ddoott ch ">Ceki Gulcu</author> - <title>Documentaions</title> + <title>Documentations</title> </properties> <body>

1 0

Margin too wide
by Ceki Gülcü 11 Aug '06

11 Aug '06

Hello Sebastien, I find that the <h1>, <h2> and <h3> tags include too much of a margin (or padding). It should be possible to modify the site css to reduce the extra space. -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://ceki.blogspot.com/

2 1

svn commit: r458 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 22:28:58 2006 New Revision: 458 Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml logback/trunk/logback-site/src/site/xdocTemplates/index.xml logback/trunk/logback-site/src/site/xdocTemplates/license.xml logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Log: several doc changes Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml Thu Aug 10 22:28:58 2006 @@ -2,11 +2,14 @@ <document> <body> -<h2>Bug reporting</h2> + <h2>Bug reporting</h2> -<p>The logback project uses a bugzilla based management system to track bugs.</p> -<p>You can report and follow logback bugs by following <a href="http://bugzilla.qos.ch/">this link</a>.</p> + <p>The logback project uses a bugzilla based management system to + track bugs.</p> + <p>You can report and follow logback bugs by following <a + href="http://bugzilla.qos.ch/">this link</a>.</p> + </body> Modified: logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml Thu Aug 10 22:28:58 2006 @@ -3,27 +3,23 @@ <properties> <author email="ceki at qos ddoott ch ">Ceki Gulcu</author> - <title>Logback project Docs</title> + <title>Documentaions</title> </properties> <body> - <div class="section"> - <h2>Documentation</h2> - </div> - - <p>Here are some documents about the logback project modules.</p> - <p> - This section is pretty light at the moment, but will grow - with the developping of $logback. - </p> + <h2>logback documentation</h2> + + <p>Below is a list of documentaiton currently available for the + logback project.</p> <ul> <li> - <a href="apidocs/index.html">Logback Javadoc</a> + <a href="shortIntro.html"><b>A short introduction to logback-classic</b></a> </li> + <li> - <a href="shortIntro.html">A short introduction to logback classic</a> + <a href="apidocs/index.html"><b>javadoc</b></a> </li> </ul> Modified: logback/trunk/logback-site/src/site/xdocTemplates/index.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/index.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/index.xml Thu Aug 10 22:28:58 2006 @@ -18,26 +18,26 @@ as 1999. </p> <p> - Logback's basic architecture is sufficiently generic so as - to apply under different circumstances. At present time, - logback is divided into three modules, Core, Classic and - Access. + Logback's basic architecture is sufficiently generic so as to + apply under different circumstances. At present time, logback is + divided into three modules, logback-core, logback-classic and + logback-access. </p> + <p> - The Core module lays the groundwork for the other two - modules. The Classic module can be assimilated to an - improved version of log4j. Logback Classic natively - implements the - <a href="http://www.slf4j.org">SLF4J API</a> - so that you can readily switch back and forth between - logback and other logging systems such as log4j or JDK14 - Logging. + The logback-core module lays the groundwork for the other two + modules. The logback-classic module can be assimilated to a + significantly improved version of log4j. Moreover, + logback-classic natively implements the <a + href="http://www.slf4j.org">SLF4J API</a> so that you can + readily switch back and forth between logback and other logging + systems such as log4j or JDK14 Logging. The Access module integrates with Servlet containers to provide HTTP-access log functionality. Note that you can easily build your own modules on top of the Core module. </p> - <p>Please stay tuned for further updates on this web-page.</p> + </body> </document> Modified: logback/trunk/logback-site/src/site/xdocTemplates/license.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/license.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/license.xml Thu Aug 10 22:28:58 2006 @@ -20,17 +20,13 @@ as published by the Free Software Foundation. </p> - <div class="source"> - <p> -Logback: the reliable, generic, fast and flexible logging library for Java. - <br /> + <div class="source big">Logback: the reliable, generic, fast and flexible logging library for Java. + Copyright (C) 2000-2006, QOS.ch - <br /> -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. - </p> - </div> + +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.</div> </body> Modified: logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml Thu Aug 10 22:28:58 2006 @@ -38,12 +38,14 @@ <table class="bodyTable"> <tr class="a"> <th>Name</th> + <th>Volume</th> <th>Subscribe</th> <th>Unsubscribe</th> <th>Archive</th> </tr> <tr class="b"> <td>Logback Announce List</td> + <td>Low</td> <td> <a href="http://qos.ch/mailman/listinfo/logback-announce"> @@ -51,10 +53,7 @@ </a> </td> <td> - <a - href="http://qos.ch/mailman/options/logback-announce"> - Unsubscribe - </a> + <a href="http://qos.ch/mailman/options/logback-announce">Unsubscribe</a> </td> <td> <a @@ -65,6 +64,7 @@ </tr> <tr class="a"> <td>Logback User List</td> + <td>Medium</td> <td> <a href="http://qos.ch/mailman/listinfo/logback-user"> @@ -86,6 +86,7 @@ </tr> <tr class="b"> <td>Logback Dev List</td> + <td>Medium</td> <td> <a href="http://qos.ch/mailman/listinfo/logback-dev"> Modified: logback/trunk/logback-site/src/site/xdocTemplates/repos.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/repos.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Thu Aug 10 22:28:58 2006 @@ -13,18 +13,16 @@ </div> <p> - To enable logback developers to work together, we - keep the source code in revision control systems called + We keep the source code in revision control systems called Subversion. Developers have write access to the Subversion repository, enabling them to make changes to the source - code. Everyone has read access to the repositories, so you - may download the most up-to-date development version of the + code. Everyone has read access to the repositories, so you may + download the most up-to-date development version of the software. Note that the latest version in the Subversion - repository many not work as expected, it may not even - compile properly. If you are looking for a stable release of - the source code, you should download an official - distribution instead of the latest version in the Subversion - repositories. + repository many not work as expected, it may not even compile + properly. If you are looking for a stable release of the source + code, you should download an official distribution instead of + the latest version in the Subversion repositories. There are several ways to access the Subversion repositories: @@ -34,44 +32,30 @@ <h2>Web Access</h2> </div> <p> - If you just wish to browse around or download a few - individual files, the best tool is the web-based ViewCVS - interface for CVS repositories and ViewCVS interface for - Subversion or go straight to the public repositories at: + If you just wish to browse around or download a few individual + files, you can do so with web-based ViewVC interface: </p> + <p> - <a href="http://svn.qos.ch/viewcvs/logback/trunk/"> - Logback SVN Repository - </a> + <a + href="http://svn.qos.ch/viewcvs/logback/trunk/">http://svn.qos.ch/viewcvs/logback/trunk/</a> </p> <div class="section"> <h2>Checking out a read-only copy</h2> </div> <p> - To access the Subversion repositories anonymously, you will - need a Subversion client. - </p> - - <p>You can check out the entire logback project by using this command:</p> + To access the Subversion repositories anonymously, you will need + a Subversion client. You can check out the entire logback + project with the following command:</p> <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/</div> - - <p>If you prefer to check out only one of the logback project modules, make your choice:</p> - - <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-core</div> - - <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-classic</div> - <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-access</div> - - <div class="section"> <p> - Note that anonymous access allows read-only access only. - For read-write access please contact the logback - <a href="../mailinglist.html">developer list</a> - . + Note that anonymous access allows read-only access only. For + read-write access please contact the logback <a + href="../mailinglist.html">developer list</a> . </p> </div> </body>

1 0

svn commit: r457 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 21:17:35 2006 New Revision: 457 Modified: logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml Log: - We don't allow unsubscribed users to post, so there is no point in including a mailto: link Modified: logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml Thu Aug 10 21:17:35 2006 @@ -40,7 +40,6 @@ <th>Name</th> <th>Subscribe</th> <th>Unsubscribe</th> - <th>Post</th> <th>Archive</th> </tr> <tr class="b"> @@ -56,10 +55,7 @@ href="http://qos.ch/mailman/options/logback-announce"> Unsubscribe </a> - </td> - <td> - <a href="mailto:logback-announce@qos.ch">Post</a> - </td> + </td> <td> <a href="http://www.qos.ch/pipermail/logback-announce/"> @@ -80,10 +76,7 @@ href="http://qos.ch/mailman/options/logback-user"> Unsubscribe </a> - </td> - <td> - <a href="mailto:logback-user@qos.ch">Post</a> - </td> + </td> <td> <a href="http://www.qos.ch/pipermail/logback-user/"> @@ -104,10 +97,7 @@ href="http://qos.ch/mailman/options/logback-dev"> Unsubscribe </a> - </td> - <td> - <a href="mailto:logback-dev@qos.ch">Post</a> - </td> + </td> <td> <a href="http://www.qos.ch/pipermail/logback-dev/">

1 0

svn commit: r456 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/net main/java/ch/qos/logback/classic/pattern main/java/ch/qos/logback/classic/util test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 20:09:20 2006 New Revision: 456 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Log: ongoing work on syslog appender Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java Thu Aug 10 20:09:20 2006 @@ -22,23 +22,24 @@ */ public class SyslogAppender extends SyslogAppenderBase { - Layout layout; - String pattern; - String patternSuffix; + String prefixPattern; + + static final public String DEFAULT_SUFFIX_PATTERN = "[%thread] %logger %m%exception"; + + public Layout buildLayout(String facilityStr) { - public Layout buildLayout(int facility) { PatternLayout pl = new PatternLayout(); pl.getInstanceConverterMap().put("syslogStart", SyslogStartConverter.class.getName()); - if(patternSuffix == null) { - patternSuffix = "%syslogStart{"+facility+"}"; + if(prefixPattern == null) { + prefixPattern = "%syslogStart{"+facilityStr+"}"; } - if(pattern == null) { - pattern = "%m%exception"; + if(suffixPattern == null) { + suffixPattern = DEFAULT_SUFFIX_PATTERN; } - pl.setPattern(patternSuffix+pattern); + pl.setPattern(prefixPattern+suffixPattern); pl.setContext(getContext()); pl.start(); return pl; @@ -56,22 +57,4 @@ return LevelToSyslogSeverity.convert(event); } - /* - * Set the layout directly. Normally, for the user SyslogAppender would want to set - * the patterns and not the layout directly. - * - * @see ch.qos.logback.core.Appender#setLayout(ch.qos.logback.core.Layout) - */ - public void setLayout(Layout layout) { - this.layout = layout; - } - - /* - * - * @see ch.qos.logback.core.Appender#getLayout() - */ - public Layout getLayout() { - return layout; - } - } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java Thu Aug 10 20:09:20 2006 @@ -33,12 +33,12 @@ String facilityStr = getFirstOption(); if (facilityStr == null) { - //errorCount++; addError("was expecting a facility string as an option"); return; } facility = SyslogAppenderBase.facilityStringToint(facilityStr); + localHostName = getLocalHostname(); try { simpleFormat = new SimpleDateFormat("MMM dd hh:mm:ss", new DateFormatSymbols(Locale.US)); @@ -57,7 +57,7 @@ StringBuilder sb = new StringBuilder(); int pri = facility + LevelToSyslogSeverity.convert(le); - System.out.println("" + pri); + sb.append("<"); sb.append(pri); sb.append(">"); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/LevelToSyslogSeverity.java Thu Aug 10 20:09:20 2006 @@ -33,7 +33,7 @@ case Level.INFO_INT: return SyslogConstants.INFO_SEVERITY; case Level.DEBUG_INT: - return SyslogConstants.LOG_ALERT; + return SyslogConstants.DEBUG_SEVERITY; default: throw new IllegalArgumentException("Level " + level + " is not a valid level for a printing method"); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSyslogServer.java Thu Aug 10 20:09:20 2006 @@ -9,27 +9,49 @@ */ package ch.qos.logback.classic.net; +import java.net.DatagramPacket; import java.net.DatagramSocket; +import java.util.ArrayList; +import java.util.List; /** - * + * * @author Ceki G&uumllcü */ public class MockSyslogServer extends Thread { + static final int PORT = 14805; + final int loopLen; - DatagramSocket socket; + + List<String> msgList = new ArrayList<String>(); + boolean finished = false; MockSyslogServer(int loopLen) { super(); this.loopLen = loopLen; - } - + @Override public void run() { - for(int i = 0; i < loopLen; i++) { - - } + DatagramSocket socket = null; + try { + socket = new DatagramSocket(PORT); + + for (int i = 0; i < loopLen; i++) { + byte[] buf = new byte[1024]; + DatagramPacket packet = new DatagramPacket(buf, buf.length); + socket.receive(packet); + String msg = new String(buf, 0, packet.getLength()); + msgList.add(msg); + } + } catch (Exception se) { + se.printStackTrace(); + } finally { + if(socket != null) { + socket.close(); + } + } + finished = true; } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Thu Aug 10 20:09:20 2006 @@ -10,6 +10,10 @@ package ch.qos.logback.classic.net; import junit.framework.TestCase; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.core.net.SyslogConstants; +import ch.qos.logback.core.util.StatusPrinter; public class SyslogAppenderTest extends TestCase { @@ -25,4 +29,80 @@ super.tearDown(); } + public void testBasic() throws InterruptedException { + MockSyslogServer mockServer = new MockSyslogServer(1); + mockServer.start(); + + LoggerContext lc = new LoggerContext(); + lc.setName("test"); + SyslogAppender sa = new SyslogAppender(); + sa.setContext(lc); + sa.setSyslogHost("localhost"); + sa.setFacility("MAIL"); + sa.setPort(MockSyslogServer.PORT); + sa.start(); + assertTrue(sa.isStarted()); + + String loggerName = this.getClass().getName(); + Logger logger = lc.getLogger(loggerName); + logger.addAppender(sa); + String logMsg = "hello"; + logger.debug(logMsg); + StatusPrinter.print(lc.getStatusManager()); + + // wait max 2 seconds for mock server to finish. However, it should + // much sooner than that. + mockServer.join(2000); + assertTrue(mockServer.finished); + assertEquals(1, mockServer.msgList.size()); + String msg = mockServer.msgList.get(0); + + String expected = "<"+(SyslogConstants.LOG_MAIL+SyslogConstants.DEBUG_SEVERITY)+">"; + assertTrue(msg.startsWith(expected)); + + String first = "<\\d{2}>\\w{3} \\d{2} \\d{2}(:\\d{2}){2} \\w* "; + String threadName = Thread.currentThread().getName(); + + assertTrue(msg.matches(first +"\\["+threadName+"\\] "+ loggerName +" " +logMsg)); + + } + + public void testExceptoin() throws InterruptedException { + MockSyslogServer mockServer = new MockSyslogServer(1); + mockServer.start(); + + LoggerContext lc = new LoggerContext(); + lc.setName("test"); + SyslogAppender sa = new SyslogAppender(); + sa.setContext(lc); + sa.setSyslogHost("localhost"); + sa.setFacility("MAIL"); + sa.setPort(MockSyslogServer.PORT); + sa.start(); + assertTrue(sa.isStarted()); + + String loggerName = this.getClass().getName(); + Logger logger = lc.getLogger(loggerName); + logger.addAppender(sa); + String logMsg = "hello"; + logger.debug(logMsg, new Exception("just testing")); + StatusPrinter.print(lc.getStatusManager()); + + // wait max 2 seconds for mock server to finish. However, it should + // much sooner than that. + mockServer.join(2000); + assertTrue(mockServer.finished); + assertEquals(1, mockServer.msgList.size()); + String msg = mockServer.msgList.get(0); + + String expected = "<"+(SyslogConstants.LOG_MAIL+SyslogConstants.DEBUG_SEVERITY)+">"; + assertTrue(msg.startsWith(expected)); + + String first = "<\\d{2}>\\w{3} \\d{2} \\d{2}(:\\d{2}){2} \\w* "; + String threadName = Thread.currentThread().getName(); + System.out.println(msg); + //assertTrue(msg.matches(first +"\\["+threadName+"\\] "+ loggerName +" " +logMsg)); + + //fail("check exceptions"); + } }

1 0

svn commit: r455 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 20:08:27 2006 New Revision: 455 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java Log: ongoing work Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java Thu Aug 10 20:08:27 2006 @@ -1,6 +1,8 @@ package ch.qos.logback.core.net; import java.io.IOException; +import java.net.SocketException; +import java.net.UnknownHostException; import ch.qos.logback.core.AppenderBase; import ch.qos.logback.core.Layout; @@ -11,8 +13,9 @@ int facility; String facilityStr; String syslogHost; + protected String suffixPattern; SyslogWriter sw; - //private String localHostname; + int port = SyslogConstants.SYSLOG_PORT; public void start() { int errorCount = 0; @@ -23,14 +26,26 @@ facility = facilityStringToint(facilityStr); - layout = getLayout(); + try { + sw = new SyslogWriter(syslogHost, port); + } catch (UnknownHostException e) { + addError("Could not create SyslogWriter", e); + errorCount++; + } catch (SocketException e) { + errorCount++; + addError("Failed to bind to a random datagram socket ", e); + } + + if(layout == null) { + layout = buildLayout(facilityStr); + } if(errorCount == 0) { super.start(); } } - abstract public Layout buildLayout(int facility); + abstract public Layout buildLayout(String facilityStr); abstract public int getSeverityForEvent(Object eventObject); @@ -39,14 +54,15 @@ if(!isStarted()) { return; } + try { String msg = layout.doLayout(eventObject); sw.write(msg); sw.flush(); + } catch(IOException ioe) { addError("Failed to send diagram to "+syslogHost, ioe); stop(); - } } @@ -143,4 +159,56 @@ } this.facilityStr = facilityStr; } + + /** + * + * @return + */ + public int getPort() { + return port; + } + + /** + * The port number on the syslog server to connect to. Nornally, wou would not + * want to change the default value, that is 514. + */ + public void setPort(int port) { + this.port = port; + } + + /** + * You can override + */ + public Layout getLayout() { + return layout; + } + + public void setLayout(Layout layout) { + this.layout = layout; + } + + @Override + public void stop() { + sw.close(); + super.stop(); + } + + /** + * See {@link #setSuffixPattern(String). + * + * @return + */ + public String getSuffixPattern() { + return suffixPattern; + } + + /** + * The <b>suffixPattern</b> option specifies the fortmat of the + * non-standardized part the message sent to the syslog server. + * + * @param pattern + */ + public void setSuffixPattern(String suffixPattern) { + this.suffixPattern = suffixPattern; + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java Thu Aug 10 20:08:27 2006 @@ -7,6 +7,9 @@ **/ public class SyslogConstants { + static public final int SYSLOG_PORT = 514; + + // Following constants extracted from RFC 3164, we multiply them by 8 // in order to precompute the facility part of PRI. // See RFC 3164, Section 4.1.1 for exact details. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java Thu Aug 10 20:08:27 2006 @@ -9,24 +9,26 @@ import java.net.UnknownHostException; /** - * SyslogWriter is a wrapper around the {@link DatagramSocket} class - * so that it behaves like a {@link Writer}. + * SyslogWriter is a wrapper around the {@link DatagramSocket} class so that it + * behaves like a {@link Writer}. */ class SyslogWriter extends Writer { + /** - * The maximum length after which we discard the existing string buffer and + * The maximum length after which we discard the existing string buffer and * start anew. */ - static final int MAX_LEN = 1024; - - static final int SYSLOG_PORT = 514; - + private static final int MAX_LEN = 1024; + private InetAddress address; private DatagramSocket ds; private StringBuffer buf = new StringBuffer(); - - public SyslogWriter(String syslogHost) throws UnknownHostException, SocketException { + final private int port; + + public SyslogWriter(String syslogHost, int port) throws UnknownHostException, + SocketException { this.address = InetAddress.getByName(syslogHost); + this.port = port; this.ds = new DatagramSocket(); } @@ -36,19 +38,19 @@ public void write(String str) throws IOException { buf.append(str); - + } public void flush() throws IOException { byte[] bytes = buf.toString().getBytes(); - DatagramPacket packet = - new DatagramPacket(bytes, bytes.length, address, SYSLOG_PORT); + DatagramPacket packet = new DatagramPacket(bytes, bytes.length, address, + port); if (this.ds != null) { ds.send(packet); } // clean up for next round - if(buf.length() > MAX_LEN) { + if (buf.length() > MAX_LEN) { buf = new StringBuffer(); } else { buf.setLength(0); @@ -59,5 +61,9 @@ address = null; ds = null; } -} + public int getPort() { + return port; + } + +}

1 0

svn commit: r454 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 19:08:35 2006 New Revision: 454 Modified: logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml Log: - replaced Lroot and Lx level values in example with real levels - updated last source code snippet - other minor fixes Modified: logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml Thu Aug 10 19:08:35 2006 @@ -92,9 +92,7 @@ <p> After you have added the jar files - <em>logback-core.jar</em> - and - <em>logback-classic.jar</em> + <em>logback-core.jar</em>, <em>logback-classic.jar</em> and their dependencies to your classpath, you can begin experimenting with logback. </p> @@ -145,8 +143,7 @@ <p> - <b>ceki: compile?</b> - You can compile and run this class with the command: + Once you're in the examples/classes directory of the logback distribution, you can run this class with the command: </p> <div class="source">java chapter1.HelloWorld1</div> @@ -243,7 +240,7 @@ will barely change. Only the configuration process will be different, since you don't need (nor should) configure the logging context in each and every class that will require - logging. As well, the LoggerStatusPrinter will certainly not be + logging. As well, the <code>LoggerStatusPrinter</code> will certainly not be used after all the logging statements. </p> @@ -316,7 +313,7 @@ It is exceptional in a way that is always exists. Like every logger, it can be retrieved by its name, like this: </p> - <div class="source">Logger rootLogger = LoggerFactory.getLogger("root");</div> + <div class="source">Logger rootLogger = LoggerFactory.getLogger(LoggerContext.<em>ROOT_NAME</em>);</div> <p> All other loggers are retrieved with the class static @@ -360,7 +357,7 @@ </div> <p> To ensure that all loggers can eventually inherit a level, - the root logger always has an assigned level. + the root logger always has an assigned level. By default, its level is DEBUG. </p> <p> Below are four examples with various assigned level values @@ -389,31 +386,31 @@ </tr> <tr> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr> <td>X</td> <td>none</td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> </tr> <tr> <td>X.Y</td> <td>none</td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> </tr> <tr> <td>X.Y.Z</td> <td>none</td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> </tr> </table> <p> In example 1 above, only the root logger is assigned a level. </p> - This level value, <code>L<sub>root</sub></code>, is inherited by the other loggers + This level value, <code>DEBUG</code>, is inherited by the other loggers <code>X</code>, <code>X.Y</code> and <code>X.Y.Z</code> <table> <tr> @@ -436,24 +433,24 @@ </tr> <tr align="left"> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>ERROR</td> + <td>ERROR</td> </tr> <tr align="left"> <td>X</td> - <td>L<sub>x</sub></td> - <td>L<sub>x</sub></td> + <td>INFO</td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y</td> - <td>L<sub>xy</sub></td> - <td>L<sub>xy</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr align="left"> <td>X.Y.Z</td> - <td>L<sub>xyz</sub></td> - <td>L<sub>xyz</sub></td> + <td>WARN</td> + <td>WARN</td> </tr> </table> @@ -482,30 +479,30 @@ </tr> <tr align="left"> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr align="left"> <td>X</td> - <td>L<sub>x</sub></td> - <td>L<sub>x</sub></td> + <td>INFO</td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y</td> <td>none</td> - <td>L<sub>x</sub></td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y.Z</td> - <td>L<sub>xyz</sub></td> - <td>L<sub>xyz</sub></td> + <td>ERROR</td> + <td>ERROR</td> </tr> </table> <p> In example 3, the loggers <code>root</code>, <code>X</code> - and <code>X.Y.Z</code> are assigned the levels <code>L<sub>root</sub></code>, - <code>L<sub>x</sub></code> and <code>L<sub>xyz</sub></code> + and <code>X.Y.Z</code> are assigned the levels <code>DEBUG</code>, + <code>INFO</code> and <code>ERROR</code> respectively. The logger <code>X.Y</code> inherits its level value from its parent <code>X</code>. </p> @@ -530,31 +527,31 @@ </tr> <tr align="left"> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr align="left"> <td>X</td> - <td>L<sub>x</sub></td> - <td>L<sub>x</sub></td> + <td>INFO</td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y</td> <td>none</td> - <td>L<sub>x</sub></td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y.Z</td> <td>none</td> - <td>L<sub>x</sub></td> + <td>INFO</td> </tr> </table> <p> In example 4, the loggers <code>root</code> and <code>X</code> - and are assigned the levels <code>L<sub>root</sub></code> and - <code>L<sub>x</sub></code> respectively. The loggers <code>X.Y</code> and + and are assigned the levels <code>DEBUG</code> and + <code>INFO</code> respectively. The loggers <code>X.Y</code> and <code>X.Y.Z</code> inherits their level value from their nearest parent <code>X</code> having an assigned level. </p> @@ -848,10 +845,10 @@ <p> For example, the PatternLayout with the conversion pattern - "%r [%t] %-5p %c - %m%n" will output something akin to: + "%-4relative [%thread] %-5level %class - %msg%n" will output something akin to: </p> - <div class="source">176 [main] INFO org.foo.Bar - Located nearest gas station.</div> + <div class="source">176 [main] DEBUG chapter1.HelloWorld3 - Hello world.</div> <p> The first field is the number of milliseconds elapsed since @@ -915,7 +912,8 @@ </p> - <div class="source">Object entry = new SomeObject(); logger.debug("The entry is {}.", entry);</div> + <div class="source">Object entry = new SomeObject(); +logger.debug("The entry is {}.", entry);</div> <p> After evaluting whether to log or not, and only if the @@ -1064,24 +1062,29 @@ package chapter1; //Import SLF4J classes. +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.Logger; -<b>import ch.qos.logback.classic.joran.JoranConfigurator;</b> +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.util.StatusPrinter; public class MyAppWithConfigFile { - - public static void main(String[] args) throws Exception { - Logger logger = (Logger) LoggerFactory.getLogger(MyAppWithConfigFile.class); - + + public static void main(String[] args) { + Logger logger = LoggerFactory.getLogger(MyAppWithConfigFile.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(logger.getLoggerContext()); + configurator.setContext(lc); configurator.doConfigure(args[0]); logger.info("Entering application."); Bar bar = new Bar(); bar.doIt(); logger.info("Exiting application."); + + StatusPrinter.print(lc.getStatusManager()); } }</div> <p> @@ -1089,6 +1092,8 @@ Joran is a XML interpreter, similar to the commons-digester API, but offering several small advantages over commons-digester. Here, it parses the xml file and runs actions depending on the tags it finds. + To setup the JoranConfigurator properly, we passed the <code>LoggerContext</code>. A <code>LoggerContext</code> + is the class that creates and manages Loggers in logback. It is also the class that implements the org.slf4j.ILoggerFactory. </p> <p>Logging to the console is a rather simple example. Let's now configure logback

1 0

svn commit: r453 - logback/trunk/src/main/assembly
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 18:49:47 2006 New Revision: 453 Modified: logback/trunk/src/main/assembly/source.xml Log: excluded output directory from the core tests. Modified: logback/trunk/src/main/assembly/source.xml ============================================================================== --- logback/trunk/src/main/assembly/source.xml (original) +++ logback/trunk/src/main/assembly/source.xml Thu Aug 10 18:49:47 2006 @@ -38,6 +38,11 @@ <fileSet> <directory>logback-core/src/</directory> <outputDirectory>logback-core/src/</outputDirectory> + <excludes> + <exclude> + test/output/ + </exclude> + </excludes> </fileSet> <fileSet> <directory>logback-classic/src/</directory>

1 0