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

svn commit: r705 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/status main/java/ch/qos/logback/core/util test/java/ch/qos/logback/core/status
by noreply.ceki＠qos.ch 17 Oct '06

17 Oct '06

Author: ceki Date: Tue Oct 17 23:35:53 2006 New Revision: 705 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java Log: StatusPrinter now does a better job when printing nested stati. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java Tue Oct 17 23:35:53 2006 @@ -1,18 +1,18 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * + * Logback: the generic, reliable, fast and flexible logging framework. + * * Copyright (C) 1999-2006, QOS.ch - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. + * + * 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.status; import java.util.Iterator; -public interface Status { +public interface Status { public final int INFO = 0; public final int WARN = 1; @@ -27,6 +27,6 @@ public boolean hasChildren(); public void add(Status child); public boolean remove(Status child); - public Iterator iterator(); + public Iterator<Status> iterator(); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusBase.java Tue Oct 17 23:35:53 2006 @@ -10,20 +10,19 @@ package ch.qos.logback.core.status; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; - abstract public class StatusBase implements Status { + static private final List<Status> EMPTY_LIST = new ArrayList<Status>(0); + int level; final String message; final Object origin; List<Status> childrenList; Throwable throwable; - StatusBase(int level, String msg, Object origin) { this(level, msg, origin, null); } @@ -37,25 +36,23 @@ public synchronized void add(Status child) { if (child == null) { - throw new NullPointerException( - "Null values are not valid Status."); + throw new NullPointerException("Null values are not valid Status."); } if (childrenList == null) { childrenList = new ArrayList<Status>(); } childrenList.add(child); } - public synchronized boolean hasChildren() { return ((childrenList != null) && (childrenList.size() > 0)); } - public synchronized Iterator iterator() { + public synchronized Iterator<Status> iterator() { if (childrenList != null) { return childrenList.iterator(); } else { - return Collections.EMPTY_LIST.iterator(); + return EMPTY_LIST.iterator(); } } @@ -64,7 +61,7 @@ return false; } - //TODO also search in childrens' childrens + // TODO also search in childrens' childrens return childrenList.remove(statusToRemove); } @@ -72,22 +69,22 @@ public int getLevel() { return level; } - + public int getEffectiveLevel() { - int result = level; - int effLevel; - - Iterator it = iterator(); - Status s; - while(it.hasNext()) { - s = (Status)it.next(); - effLevel = s.getEffectiveLevel(); - if (effLevel > result) { - result = effLevel; - } - } - - return result; + int result = level; + int effLevel; + + Iterator it = iterator(); + Status s; + while (it.hasNext()) { + s = (Status) it.next(); + effLevel = s.getEffectiveLevel(); + if (effLevel > result) { + result = effLevel; + } + } + + return result; } public String getMessage() { @@ -101,24 +98,24 @@ public Throwable getThrowable() { return throwable; } - + /** * @Override */ public String toString() { StringBuffer buf = new StringBuffer(); - switch(level) { - case INFO: + switch (level) { + case INFO: buf.append("INFO"); break; - case WARN: + case WARN: buf.append("WARN"); break; - case ERROR: + case ERROR: buf.append("ERROR"); break; } - if(origin != null) { + if (origin != null) { buf.append(" in "); buf.append(origin); buf.append(" -"); @@ -126,14 +123,13 @@ buf.append(" "); buf.append(message); - - if(throwable != null) { + + if (throwable != null) { buf.append(" "); buf.append(throwable); } - + return buf.toString(); } - - + } 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 Tue Oct 17 23:35:53 2006 @@ -37,10 +37,30 @@ Iterator it = sm.iterator(); while (it.hasNext()) { Status s = (Status) it.next(); - System.out.println(s); - if (s.getThrowable() != null) { - s.getThrowable().printStackTrace(System.out); + print("", s); + + } + } + + private static void print(String indentation, Status s) { + String prefix; + if(s.hasChildren()) { + prefix = indentation + "+ "; + } else { + prefix = indentation + "|-"; + } + System.out.println(prefix+s); + if (s.getThrowable() != null) { + s.getThrowable().printStackTrace(System.out); + } + if(s.hasChildren()) { + Iterator<Status> ite = s.iterator(); + while(ite.hasNext()) { + Status child = ite.next(); + print(indentation+" ", child); } + } } + } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java Tue Oct 17 23:35:53 2006 @@ -1,3 +1,12 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package ch.qos.logback.core.status; import java.util.Iterator; @@ -6,72 +15,75 @@ public class StatusBaseTest extends TestCase { - public void testAddStatus() { - { - InfoStatus status = new InfoStatus("testing", this); - status.add(new ErrorStatus("error", this)); - Iterator it = status.iterator(); - assertTrue("No status was added", it.hasNext()); - assertTrue("hasChilden method reported wrong result", status - .hasChildren()); - } - { - InfoStatus status = new InfoStatus("testing", this); - try { - status.add(null); - fail("method should have thrown an Exception"); - } catch (NullPointerException ex) { - } - } - } - - public void testRemoveStatus() { - { - InfoStatus status = new InfoStatus("testing", this); - ErrorStatus error = new ErrorStatus("error", this); - status.add(error); - boolean result = status.remove(error); - Iterator it = status.iterator(); - assertTrue("Remove failed", result); - assertFalse("No status was removed", it.hasNext()); - assertFalse("hasChilden method reported wrong result", status - .hasChildren()); - } - { - InfoStatus status = new InfoStatus("testing", this); - ErrorStatus error = new ErrorStatus("error", this); - status.add(error); - boolean result = status.remove(null); - assertFalse("Remove result was not false", result); - } - } - - public void testEffectiveLevel() { - { - //effective level = 0 level deep - ErrorStatus status = new ErrorStatus("error", this); - WarnStatus warn = new WarnStatus("warning", this); - status.add(warn); - assertEquals("effective level misevaluated", status.getEffectiveLevel(), Status.ERROR); - } - - { - //effective level = 1 level deep - InfoStatus status = new InfoStatus("info", this); - WarnStatus warn = new WarnStatus("warning", this); - status.add(warn); - assertEquals("effective level misevaluated", status.getEffectiveLevel(), Status.WARN); - } - - { - //effective level = 2 levels deep - InfoStatus status = new InfoStatus("info", this); - WarnStatus warn = new WarnStatus("warning", this); - ErrorStatus error = new ErrorStatus("error", this); - status.add(warn); - warn.add(error); - assertEquals("effective level misevaluated", status.getEffectiveLevel(), Status.ERROR); - } - } + public void testAddStatus() { + { + InfoStatus status = new InfoStatus("testing", this); + status.add(new ErrorStatus("error", this)); + Iterator it = status.iterator(); + assertTrue("No status was added", it.hasNext()); + assertTrue("hasChilden method reported wrong result", status + .hasChildren()); + } + { + InfoStatus status = new InfoStatus("testing", this); + try { + status.add(null); + fail("method should have thrown an Exception"); + } catch (NullPointerException ex) { + } + } + } + + public void testRemoveStatus() { + { + InfoStatus status = new InfoStatus("testing", this); + ErrorStatus error = new ErrorStatus("error", this); + status.add(error); + boolean result = status.remove(error); + Iterator it = status.iterator(); + assertTrue("Remove failed", result); + assertFalse("No status was removed", it.hasNext()); + assertFalse("hasChilden method reported wrong result", status + .hasChildren()); + } + { + InfoStatus status = new InfoStatus("testing", this); + ErrorStatus error = new ErrorStatus("error", this); + status.add(error); + boolean result = status.remove(null); + assertFalse("Remove result was not false", result); + } + } + + public void testEffectiveLevel() { + { + // effective level = 0 level deep + ErrorStatus status = new ErrorStatus("error", this); + WarnStatus warn = new WarnStatus("warning", this); + status.add(warn); + assertEquals("effective level misevaluated", status.getEffectiveLevel(), + Status.ERROR); + } + + { + // effective level = 1 level deep + InfoStatus status = new InfoStatus("info", this); + WarnStatus warn = new WarnStatus("warning", this); + status.add(warn); + assertEquals("effective level misevaluated", status.getEffectiveLevel(), + Status.WARN); + } + + { + // effective level = 2 levels deep + InfoStatus status = new InfoStatus("info", this); + WarnStatus warn = new WarnStatus("warning", this); + ErrorStatus error = new ErrorStatus("error", this); + status.add(warn); + warn.add(error); + assertEquals("effective level misevaluated", status.getEffectiveLevel(), + Status.ERROR); + } + } }

1 0

svn commit: r704 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status
by noreply.ceki＠qos.ch 17 Oct '06

17 Oct '06

Author: ceki Date: Tue Oct 17 22:56:16 2006 New Revision: 704 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java Log: added hasChildren to Status interface Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/Status.java Tue Oct 17 22:56:16 2006 @@ -24,6 +24,7 @@ String getMessage(); Throwable getThrowable(); + public boolean hasChildren(); public void add(Status child); public boolean remove(Status child); public Iterator iterator();

1 0

svn commit: r703 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty
by noreply.seb＠qos.ch 17 Oct '06

17 Oct '06

Author: seb Date: Tue Oct 17 16:44:25 2006 New Revision: 703 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Log: using port 8088 for jetty test setup Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java Tue Oct 17 16:44:25 2006 @@ -22,7 +22,7 @@ } public void testGetRequest() throws Exception { - URL url = new URL("http://localhost:8080/"); + URL url = new URL("http://localhost:"+ JettyTestSetup.PORT + "/"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoInput(true); @@ -35,7 +35,7 @@ } public void testEventGoesToAppenders() throws Exception { - URL url = new URL("http://localhost:8080/"); + URL url = new URL("http://localhost:"+ JettyTestSetup.PORT + "/"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoInput(true); Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Tue Oct 17 16:44:25 2006 @@ -26,28 +26,29 @@ import ch.qos.logback.core.appender.ListAppender; public class JettyTestSetup extends TestSetup { - RequestLogImpl requestLogImpl; + public static final int PORT = 8088; + public JettyTestSetup(Test suite, RequestLogImpl impl) { super(suite); requestLogImpl = impl; } - + public String getName() { return "Jetty Test Setup"; } Server server; - String url = "http://localhost:8080/"; + String url = "http://localhost:" + PORT + "/"; public void setUp() throws Exception { - //System.out.println("into setUp"); + // System.out.println("into setUp"); super.setUp(); server = new Server(); Connector connector = new SelectChannelConnector(); - connector.setPort(8080); + connector.setPort(PORT); server.setConnectors(new Connector[] { connector }); ContextHandler context = new ContextHandler(); @@ -68,7 +69,7 @@ } public void tearDown() throws Exception { - //System.out.println("into tearDown"); + // System.out.println("into tearDown"); super.tearDown(); server.stop(); Thread.sleep(1000); @@ -88,7 +89,7 @@ console.setName("console"); PatternLayout layout = new PatternLayout(); layout.setContext(requestLogImpl); - layout.setPattern("%date %server %clientHost %post"); + layout.setPattern("%date %server %clientHost"); console.setLayout(layout); layout.start(); console.start();

1 0

svn commit: r702 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty
by noreply.seb＠qos.ch 17 Oct '06

17 Oct '06

Author: seb Date: Tue Oct 17 16:37:02 2006 New Revision: 702 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Log: Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Tue Oct 17 16:37:02 2006 @@ -33,6 +33,10 @@ super(suite); requestLogImpl = impl; } + + public String getName() { + return "Jetty Test Setup"; + } Server server; String url = "http://localhost:8080/";

1 0

svn commit: r701 - logback/trunk/logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 17 Oct '06

17 Oct '06

Author: seb Date: Tue Oct 17 16:27:06 2006 New Revision: 701 Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: on going work on documentation Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Tue Oct 17 16:27:06 2006 @@ -63,7 +63,8 @@ String getFooter(); - String getContentType();</div> + String getContentType(); +}</div> This interface is really simple and yet is sufficent for many formatting needs. @@ -155,15 +156,15 @@ }</div> - The conversion pattern is set to be "%-5level [%thread]: - %message%n". Running PatternSample will yield the following + The conversion pattern is set to be %-5level [%thread]: + %message%n. Running PatternSample will yield the following output on the console. <div class="source">DEBUG [main]: Message 1 WARN [main]: Message 2</div> - Note that in the conversion pattern "%-5level [%thread]: - %message%n" there is no explicit separator between literal + Note that in the conversion pattern %-5level [%thread]: + %message%n there is no explicit separator between literal text and conversion specifiers. When parsing a conversion pattern, <code>PatternLayout</code> @@ -253,8 +254,7 @@ Used to output the date of the logging event. The date conversion specifier may be followed by a set of braces containing a date and time - pattern strings {@link - java.text.SimpleDateFormat}, + pattern strings following <code>java.text.SimpleDateFormat</code>, ABSOLUTE , DATE @@ -556,7 +556,7 @@ <th>Comment</th> <tr> - <td align="center">%20c</td> + <td align="center">%20l</td> <td align="center">false</td> <td align="center">20</td> <td align="center">none</td> @@ -566,7 +566,7 @@ </td> </tr> <tr> - <td align="center">%-20c</td> + <td align="center">%-20l</td> <td align="center">true</td> <td align="center">20</td> <td align="center">none</td> @@ -576,7 +576,7 @@ </td> </tr> <tr> - <td align="center">%.30c</td> + <td align="center">%.30l</td> <td align="center">NA</td> <td align="center">none</td> <td align="center">30</td> @@ -586,7 +586,7 @@ </td> </tr> <tr> - <td align="center">%20.30c</td> + <td align="center">%20.30l</td> <td align="center">false</td> <td align="center">20</td> <td align="center">30</td> @@ -598,7 +598,7 @@ </td> </tr> <tr> - <td align="center">%-20.30c</td> + <td align="center">%-20.30l</td> <td align="center">true</td> <td align="center">20</td> <td align="center">30</td> @@ -780,7 +780,9 @@ Of course, one can change the expression to match one's specific situation. An expression testing logger name and - request level could also be meaningful. + request level could also be meaningful: all logging requests of + level WARN and up, coming from a sensible part of an application + like a financial transaction module, would have their caller data displayed. Important: With the caller conversion specifier, the data is displayed when the expression passed to the evaluator is true. @@ -862,9 +864,11 @@ conversion pattern. See <code>PatternLayout</code> for documentation on the available patterns. + One notable point about the use of <code>PatternLayout</code> with <code>HTMLLayout</code> + is that conversion specifiers should not be separated by a space. Each specifier found in the + pattern will result in a separate column, meaning that spaces will create empty columns. - Note that the pattern - %ex + The pattern %ex used to display an Exception is not the only way to display an Exception with this layout. If you use this pattern, a table column will be created to display the potential @@ -892,8 +896,17 @@ A user-specified external CSS file can be linked to the html page. In case one does not want to customize the html - output, an internal CSS style is used. + output, an internal CSS style is used. In that case, the following + xml element can be nested into the <code><layout></code> element. +<div class="source"><layout> + ... + <cssBuilder class="ch.qos.logback.core.helpers.CssBuilder"> + <param name="url" value="path_to_StyleFile.css" /> + </cssBuilder> + ... +</layout></div> + The HTMLLayout is often used in conjunction with SMTPAppender, to send a nicely formatted html email. Of @@ -928,7 +941,6 @@ educationnal purposes. - <h2>Logback access</h2> Just like <code>ClassicLayout</code> represents the <code>Layout</code> interface for the classic module, the <code>AccessLayout</code> exists for the access module. It's @@ -949,6 +961,7 @@ However, the conversion specifier are different, giving specific access to request and response objects' attributes. + Here are the conversion specifier one can use with logback access <code>PatternLayout</code>. @@ -1116,14 +1129,28 @@ </td> </tr> </table> + + Logback access' <code>PatternLayout</code> also recognize three keywords, which + act like shortcuts to a certain pattern. - - - - - + <ul> + common or CLF + combined + </ul> + + The common keyword corresponds to the pattern %h %l %u %t \"%r\" %s %b + which displays client host, remote log name, user, date, requested URL, status code + and response's content length + + The combined keyword is a shortcut to + %h %l %u %t \"%r\" %s %b \"%i{Referer}\" \"%i{User-Agent}\". This pattern begins + much like the common pattern but also displays two request headers, namely + referer, and user-agent. <h3>HTMLLayout</h3> + + The access version of <code>HTMLLayout</code> works like logback classic's + version. </body> </document>

1 0

svn commit: r700 - in logback/trunk/logback-core/src/test: java/ch/qos/logback/core/rolling witness/rolling
by noreply.seb＠qos.ch 17 Oct '06

17 Oct '06

Author: seb Date: Tue Oct 17 16:19:31 2006 New Revision: 700 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Log: another correction, testing again on the unix machine. Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Tue Oct 17 16:19:31 2006 @@ -105,17 +105,14 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - long now = System.currentTimeMillis(); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } - long newNow = System.currentTimeMillis(); - System.out.println("Done waiting. Waited: " + (newNow - now)); - for (int i = 0; i < 3; i++) { - System.out.println(i + " expected filename [" + filenames[i] + "]."); - } +// for (int i = 0; i < 3; i++) { +// System.out.println(i + " expected filename [" + filenames[i] + "]."); +// } for (int i = 0; i < 3; i++) { assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX @@ -152,9 +149,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i <= 10; i++) { + for (int i = 0; i <= 2; i++) { rfa1.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } rfa1.stop(); @@ -169,9 +166,9 @@ rfa2.setRollingPolicy(tbrp2); rfa2.start(); - for (int i = 3; i <= 10; i++) { + for (int i = 0; i <= 2; i++) { rfa2.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(100); } for (int i = 0; i < 3; i++) { @@ -211,9 +208,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } // for (int i = 0; i < 3; i++) { @@ -260,9 +257,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i <= 20; i++) { + for (int i = 0; i <= 2; i++) { rfa1.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } rfa1.stop(); @@ -278,9 +275,9 @@ rfa2.setRollingPolicy(tbrp2); rfa2.start(); - for (int i = 1; i <= 5; i++) { + for (int i = 0; i <= 2; i++) { rfa2.doAppend("Hello---" + i); - Thread.sleep(20); + Thread.sleep(100); } for (int i = 0; i < 3; i++) { @@ -321,9 +318,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } for (int i = 0; i < 3; i++) { @@ -364,14 +361,14 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } - for (int i = 0; i < 4; i++) { - // System.out.println(i + " expected filename [" + filenames[i] + "]."); - } +// for (int i = 0; i < 4; i++) { +// System.out.println(i + " expected filename [" + filenames[i] + "]."); +// } for (int i = 0; i < 2; i++) { assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---11 -Hello---12 -Hello---13 -Hello---14 -Hello---15 -Hello---16 -Hello---17 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 Tue Oct 17 16:19:31 2006 @@ -1 +1,4 @@ -Hello---10 +Hello---2 +Hello---0 +Hello---1 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---11 -Hello---12 -Hello---13 -Hello---14 -Hello---15 -Hello---16 -Hello---17 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 Tue Oct 17 16:19:31 2006 @@ -1,8 +1,4 @@ -Hello---18 -Hello---19 -Hello---20 +Hello---2 +Hello---0 Hello---1 Hello---2 -Hello---3 -Hello---4 -Hello---5 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 -Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---11 -Hello---12 -Hello---13 -Hello---14 -Hello---15 -Hello---16 -Hello---17 +Hello---1 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2

1 0

svn commit: r699 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 17 Oct '06

17 Oct '06

Author: seb Date: Tue Oct 17 15:46:47 2006 New Revision: 699 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Log: Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Tue Oct 17 15:46:47 2006 @@ -100,19 +100,22 @@ + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - + System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); System.out.println("Done waiting."); - + + long now = System.currentTimeMillis(); for (int i = 0; i < 20; i++) { rfa.doAppend("Hello---" + i); Thread.sleep(50); } - -// for (int i = 0; i < 3; i++) { -// System.out.println(i + " expected filename [" + filenames[i] + "]."); -// } + long newNow = System.currentTimeMillis(); + System.out.println("Done waiting. Waited: " + (newNow - now)); + + for (int i = 0; i < 3; i++) { + System.out.println(i + " expected filename [" + filenames[i] + "]."); + } for (int i = 0; i < 3; i++) { assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX

1 0

svn commit: r698 - in logback/trunk/logback-core/src/test: java/ch/qos/logback/core/rolling witness/rolling
by noreply.seb＠qos.ch 17 Oct '06

17 Oct '06

Author: seb Date: Tue Oct 17 15:34:52 2006 New Revision: 698 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Log: correcting TimeBasedRollingTest.java Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Tue Oct 17 15:34:52 2006 @@ -257,7 +257,7 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i <= 22; i++) { + for (int i = 0; i <= 20; i++) { rfa1.doAppend("Hello---" + i); Thread.sleep(50); } @@ -275,7 +275,7 @@ rfa2.setRollingPolicy(tbrp2); rfa2.start(); - for (int i = 3; i <= 5; i++) { + for (int i = 1; i <= 5; i++) { rfa2.doAppend("Hello---" + i); Thread.sleep(20); } Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 Tue Oct 17 15:34:52 2006 @@ -13,3 +13,6 @@ Hello---12 Hello---13 Hello---14 +Hello---15 +Hello---16 +Hello---17 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 Tue Oct 17 15:34:52 2006 @@ -1,5 +1,2 @@ -Hello---15 -Hello---16 -Hello---17 Hello---18 Hello---19 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 Tue Oct 17 15:34:52 2006 @@ -13,3 +13,6 @@ Hello---4 Hello---5 Hello---6 +Hello---7 +Hello---8 +Hello---9 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 Tue Oct 17 15:34:52 2006 @@ -1,4 +1 @@ -Hello---7 -Hello---8 -Hello---9 Hello---10 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 Tue Oct 17 15:34:52 2006 @@ -1,5 +1,2 @@ -Hello---15 -Hello---16 -Hello---17 Hello---18 Hello---19 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 Tue Oct 17 15:34:52 2006 @@ -13,3 +13,6 @@ Hello---12 Hello---13 Hello---14 +Hello---15 +Hello---16 +Hello---17 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 Tue Oct 17 15:34:52 2006 @@ -1,11 +1,8 @@ -Hello---15 -Hello---16 -Hello---17 Hello---18 Hello---19 Hello---20 -Hello---21 -Hello---22 +Hello---1 +Hello---2 Hello---3 Hello---4 -Hello---5 \ No newline at end of file +Hello---5 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 Tue Oct 17 15:34:52 2006 @@ -13,3 +13,6 @@ Hello---12 Hello---13 Hello---14 +Hello---15 +Hello---16 +Hello---17 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 Tue Oct 17 15:34:52 2006 @@ -1,5 +1,2 @@ -Hello---15 -Hello---16 -Hello---17 Hello---18 Hello---19 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Tue Oct 17 15:34:52 2006 @@ -1,5 +1,2 @@ -Hello---15 -Hello---16 -Hello---17 Hello---18 Hello---19

1 0

svn commit: r697 - in logback/trunk: logback-classic/examples/src/chapter5 logback-classic/src/main/java/ch/qos/logback/classic/boolex logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 16 Oct '06

16 Oct '06

Author: seb Date: Mon Oct 16 21:30:39 2006 New Revision: 697 Added: logback/trunk/logback-classic/examples/src/chapter5/TestException.java Modified: logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java logback/trunk/logback-classic/examples/src/chapter5/ExceptionEvaluatorExample.java logback/trunk/logback-classic/examples/src/chapter5/exceptionEvaluatorConfig.xml logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: Work in progress: - added a throwable variable to JaninoEventEvaluator - updated documentation and examples about layouts. Modified: logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java ============================================================================== --- logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java (original) +++ logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java Mon Oct 16 21:30:39 2006 @@ -10,7 +10,7 @@ public class CallerEvaluatorExample { - public static void main(String[] args) throws InterruptedException { + public static void main(String[] args) { Logger logger = (Logger) LoggerFactory .getLogger(CallerEvaluatorExample.class); LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); Modified: logback/trunk/logback-classic/examples/src/chapter5/ExceptionEvaluatorExample.java ============================================================================== --- logback/trunk/logback-classic/examples/src/chapter5/ExceptionEvaluatorExample.java (original) +++ logback/trunk/logback-classic/examples/src/chapter5/ExceptionEvaluatorExample.java Mon Oct 16 21:30:39 2006 @@ -1,8 +1,6 @@ package chapter5; import org.slf4j.LoggerFactory; -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; @@ -12,7 +10,7 @@ public class ExceptionEvaluatorExample { - public static void main(String[] args) throws InterruptedException { + public static void main(String[] args) { Logger logger = (Logger) LoggerFactory .getLogger(ExceptionEvaluatorExample.class); LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); @@ -26,11 +24,10 @@ } for (int i = 0; i < 5; i++) { if (i == 3) { - Marker ignoreMarker = MarkerFactory.getMarker("IGNORE"); - logger.debug(ignoreMarker, "logging statement" + i, new Exception( - "test")); + logger.debug("logging statement " + i, new TestException( + "do not display this")); } else { - logger.debug("logging statement" + i, new Exception("test")); + logger.debug("logging statement " + i, new Exception("display")); } } Added: logback/trunk/logback-classic/examples/src/chapter5/TestException.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/examples/src/chapter5/TestException.java Mon Oct 16 21:30:39 2006 @@ -0,0 +1,10 @@ +package chapter5; + +public class TestException extends Exception { + + private static final long serialVersionUID = 8326547927308399902L; + + public TestException(String message) { + super(message); + } +} Modified: logback/trunk/logback-classic/examples/src/chapter5/exceptionEvaluatorConfig.xml ============================================================================== --- logback/trunk/logback-classic/examples/src/chapter5/exceptionEvaluatorConfig.xml (original) +++ logback/trunk/logback-classic/examples/src/chapter5/exceptionEvaluatorConfig.xml Mon Oct 16 21:30:39 2006 @@ -1,7 +1,7 @@ <configuration> <evaluator name="DISPLAY_EX_EVAL"> - <Expression>marker.contains("IGNORE")</Expression> + <Expression>throwable != null && throwable instanceof chapter5.TestException</Expression> </evaluator> <appender name="STDOUT" Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java Mon Oct 16 21:30:39 2006 @@ -34,7 +34,7 @@ DEFAULT_PARAM_NAME_LIST.add("level"); DEFAULT_PARAM_NAME_LIST.add("timeStamp"); DEFAULT_PARAM_NAME_LIST.add("marker"); - + DEFAULT_PARAM_NAME_LIST.add("throwable"); DEFAULT_PARAM_TYPE_LIST.add(int.class); @@ -48,6 +48,7 @@ DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(long.class); DEFAULT_PARAM_TYPE_LIST.add(Marker.class); + DEFAULT_PARAM_TYPE_LIST.add(Throwable.class); } protected String getDecoratedExpression() { @@ -93,7 +94,11 @@ values[i++] = loggingEvent.getLevel().toInteger(); values[i++] = new Long(loggingEvent.getTimeStamp()); values[i++] = loggingEvent.getMarker(); - + if (loggingEvent.getThrowableInformation() != null) { + values[i++] = loggingEvent.getThrowableInformation().getThrowable(); + } else { + values[i++] = null; + } for(int j = 0; j < matcherListSize; j++) { values[i++] = (Matcher) matcherList.get(j); Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Mon Oct 16 21:30:39 2006 @@ -149,7 +149,8 @@ rootLogger.addAppender(appender); - rootLogger.debug("Message 1"); rootLogger.warn("Message 2"); + rootLogger.debug("Message 1"); + rootLogger.warn("Message 2"); } }</div> @@ -158,7 +159,8 @@ %message%n". Running PatternSample will yield the following output on the console. - <div class="source">DEBUG [main]: Message 1 WARN [main]: Message 2</div> + <div class="source">DEBUG [main]: Message 1 +WARN [main]: Message 2</div> Note that in the conversion pattern "%-5level [%thread]: %message%n" there is no explicit separator between literal @@ -720,7 +722,7 @@ <appender-ref ref="STDOUT" /> </root> </configuration></div> - Please note that & value cannot be written like one would in a java + Please note that the & value cannot be written like one would do in a java class, because of XML format encoding. Let's test this configuration with the following code. @@ -729,22 +731,27 @@ <div class="source">public class CallerEvaluatorExample { - public static void main(String[] args) throws InterruptedException { - Logger logger = (Logger) - LoggerFactory.getLogger(CallerEvaluatorExample.class); - LoggerContext lc = (LoggerContext) - LoggerFactory.getILoggerFactory(); - - JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(lc); - configurator.doConfigure(args[0]); - - for (int i = 0; i < 5; i++) { if (i == 3) { - logger.debug("stacktrace logging statement" + i); - } else { - logger.debug("logging statement" + i); - } - } + public static void main(String[] args) { + Logger logger = (Logger) LoggerFactory + .getLogger(CallerEvaluatorExample.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + + try { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure(args[0]); + } catch (JoranException je) { + StatusPrinter.print(lc); + } + + for (int i = 0; i < 5; i++) { + if (i == 3) { + logger.debug("stacktrace logging statement" + i); + } else { + logger.debug("logging statement" + i); + } + } + } }</div> This excerpt does nothing very fancy. Five logging requests @@ -761,26 +768,56 @@ <code>EventEvaluatorExample</code> class. - <div class="source">0 [main] DEBUG - logging statement0 -0 [main] DEBUG - logging statement1 -0 [main] DEBUG - logging statement2 -0 [main] DEBUG - logging statement3 Caller+0 at chapter5.CallerEvaluatorExample.main \ - (CallerEvaluatorExample.java:25) + <div class="source">0 [main] DEBUG - logging statement0 +0 [main] DEBUG - logging statement1 +0 [main] DEBUG - logging statement2 +0 [main] DEBUG - stacktrace logging statement3 Caller+0 \ + at chapter5.CallerEvaluatorExample.main(CallerEvaluatorExample.java:28) -16 [main] DEBUG - logging statement4</div> +0 [main] DEBUG - logging statement4 +</div> Of course, one can change the expression to match one's specific situation. An expression testing logger name and request level could also be meaningful. + Important: With the caller conversion specifier, the data is + displayed when the expression passed to the evaluator is true. Let's look at a different situation. When exceptions are - added to a logging request, they are usually displayed. But - one can easily imagine that, for the sake of readability of - a log file, one would want only a certain type of exceptions - to be displayed. + added to a logging request, they are usually displayed. However, in some cases, + one might want some exceptions never to be displayed. + The java code shown below is creating five log requests, each one + with an exception. However, we do not want request number 3 to display + its exception in the logging output. + +<div class="source">public class ExceptionEvaluatorExample { + + public static void main(String[] args) { + Logger logger = (Logger) LoggerFactory + .getLogger(ExceptionEvaluatorExample.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + + try { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure(args[0]); + } catch (JoranException je) { + StatusPrinter.print(lc); + } + for (int i = 0; i < 5; i++) { + if (i == 3) { + logger.debug("logging statement " + i, new TestException( + "do not display this")); + } else { + logger.debug("logging statement " + i, new Exception("display")); + } + } + } +}</div> + The following configuration will allow that. Example 5.3: Sample usage of EventEvaluators @@ -788,32 +825,35 @@ <div class="source"><configuration> - <evaluator name="DISPLAY_EX_EVAL"> - <Expression>marker.contains("IGNORE")</Expression> - </evaluator> - - <appender name="STDOUT" - class="ch.qos.logback.core.ConsoleAppender"> - <layout class="ch.qos.logback.classic.PatternLayout"> - <param name="Pattern" value="%-4relative [%thread] %-5level - %msg%n \ - %ex{full, DISPLAY_EX_EVAL}%n" /> - </layout> - </appender> + <evaluator name="DISPLAY_EX_EVAL"> + <Expression>throwable != null && throwable instanceof \ + chapter5.TestException</Expression> + </evaluator> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" + value="%-4relative [%thread] %-5level - %msg \ + %ex{full, DISPLAY_EX_EVAL}%n" /> + </layout> + </appender> - <root> - <level value="debug" /> - <appender-ref ref="STDOUT" /> + <root> + <level value="debug" /> + <appender-ref ref="STDOUT" /> </root> </configuration></div> - With this configuration, each time a marker named - IGNORE + With this configuration, each time an instance of the + chapter5.TestException will be associated with a logging request containing an exception, no information will be displayed about the exception. - + Important: With the ex conversion specifier, the data is + displayed when the expression passed to the evaluator is false. <h3>HTMLLayout</h3> HTMLLayout outputs events in an HTML table. Each row of the table corresponds to an event. @@ -860,8 +900,8 @@ course, it can be used with any other Appender. - In case on wants to use the HTMLLayout with a SMTPAppender, - here is a sample configuration file that can be used. + When one wants to use the HTMLLayout with a SMTPAppender, + the following configuration is typically used. <div class="source"><configuration> <appender name="SMTP" class="ch.qos.logback.classic.net.SMTPAppender"> @@ -890,7 +930,199 @@ <h2>Logback access</h2> + Just like <code>ClassicLayout</code> represents the <code>Layout</code> interface + for the classic module, the <code>AccessLayout</code> exists for the access module. It's + implementation is very straight-forward. + + <div class="source">public interface AccessLayout extends Layout { + + String doLayout(AccessEvent event); + +}</div> + + Many access layouts are actually adaptations of classic layouts. Logback + modules classic and access address pretty different needs, but offer the same power + and flexibility to the user. + <h3>PatternLayout</h3> + Access' <code>PatternLayout</code> work the exact same way as it's classic counterpart. + + However, the conversion specifier are different, giving specific access to request + and response objects' attributes. + Here are the conversion specifier one can use with logback access + <code>PatternLayout</code>. + + <table border="1" CELLPADDING="8"> + <th align="center">Conversion Character or Word</th> + <th align="center">Effect</th> + + <tr> + <td align="center">a / remoteIP</td> + <td> + + Remote IP address. + + </td> + </tr> + <tr> + <td align="center">A / localIP</td> + <td> + + Local IP address. + + </td> + </tr> + <tr> + <td align="center">b / B / byteSent</td> + <td> + + Response's content length. + + </td> + </tr> + <tr> + <td align="center">h / clientHost</td> + <td> + + Remote host. + + </td> + </tr> + <tr> + <td align="center">H / protocol</td> + <td> + + Request protocol. + + </td> + </tr> + <tr> + <td align="center">l</td> + <td> + + Remote log name. In logback-access, this converter always + returns the value "-". + + </td> + </tr> + + <tr> + <td align="center">reqParameter{paramName}</td> + <td> + + Parameter of the response. This conversion word can be followed by a key + whose corresponding data will be extracted from the header information. + + </td> + </tr> + <tr> + <td align="center">i{header} / header{header}</td> + <td> + + Request header. Just like the reqParameter + conversion word, reqParameter can be followed by a key. + + </td> + </tr> + <tr> + <td align="center">m / requestMethod</td> + <td> + + Request method. + + </td> + </tr> + <tr> + <td align="center">r / requestURL</td> + <td> + + URL requested. + + </td> + </tr> + <tr> + <td align="center">s / statusCode</td> + <td> + + Status code of the request. + + </td> + </tr> + <tr> + <td align="center">t / date</td> + <td> + + Date of the event. + + </td> + </tr> + <tr> + <td align="center">u / user</td> + <td> + + Remote user. + + </td> + </tr> + <tr> + <td align="center">U / requestURI</td> + <td> + + Requested URI. + + </td> + </tr> + <tr> + <td align="center">v / server</td> + <td> + + Server name. + + </td> + </tr> + <tr> + <td align="center">localPort</td> + <td> + + Local port. + + </td> + </tr> + <tr> + <td align="center">reqAttribute{attributeName}</td> + <td> + + Attribute of the request. Just like the reqParameter + conversion word, reqAttribute can be followed by a key. + + </td> + </tr> + <tr> + <td align="center">reqCookie{cookie}</td> + <td> + + Request cookie. Just like the reqParameter + conversion word, reqCookie can be followed by a key. + + </td> + </tr> + <tr> + <td align="center">responseHeader{header}</td> + <td> + + Header of the response. Just like the reqParameter + conversion word, responseHeader can be followed by a key. + + </td> + </tr> + </table> + + + + + + + <h3>HTMLLayout</h3> </body>

1 0

svn commit: r696 - logback/trunk
by noreply.seb＠qos.ch 16 Oct '06

16 Oct '06

Author: seb Date: Mon Oct 16 18:08:26 2006 New Revision: 696 Modified: logback/trunk/pom.xml Log: removed unused elements Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Oct 16 18:08:26 2006 @@ -115,27 +115,6 @@ <version>1.0-beta-1</version> </extension> </extensions> - - <plugins> -  - <plugin> - <artifactId>maven-one-plugin</artifactId> - <executions> - <execution> - <configuration> - <remoteRepositoryUrl>file:////magma/maven/remote_repository</remoteRepositoryUrl> - </configuration> - <goals> - <goal>deploy-maven-one-repository</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - - - </build> <reporting> @@ -219,19 +198,5 @@ <id>pixie</id> <url>scp://pixie/var/www/logback.qos.ch/htdocs/kidding/</url> </site> - - <repository> - <id>lodh-release-repository</id> - <name>LODH repository</name> - <url>file:////gaugin.dev.biz.lodh.com/maven2/lodh-release-repository</url> - </repository> - <snapshotRepository> - <id>lodh-snapshot-repository</id> - <name>LODH repository</name> - <url>file:////gaugin.dev.biz.lodh.com/maven2/lodh-snapshot-repository</url> - <uniqueVersion>false</uniqueVersion> - </snapshotRepository> - - </distributionManagement> </project> \ No newline at end of file

1 0