November 2006 - logback-dev

svn commit: r1041 - logback/trunk/logback-site/src/site/resources
by noreply.ceki＠qos.ch 29 Nov '06

29 Nov '06

Author: ceki Date: Wed Nov 29 22:48:58 2006 New Revision: 1041 Modified: logback/trunk/logback-site/src/site/resources/10reasons.ppt Log: minor corrections Modified: logback/trunk/logback-site/src/site/resources/10reasons.ppt ============================================================================== Binary files. No diff available.

1 0

svn commit: r1040 - logback/trunk/logback-site/src/site/resources
by noreply.ceki＠qos.ch 29 Nov '06

29 Nov '06

Author: ceki Date: Wed Nov 29 22:34:15 2006 New Revision: 1040 Modified: logback/trunk/logback-site/src/site/resources/10reasons.ppt Log: Modified: logback/trunk/logback-site/src/site/resources/10reasons.ppt ============================================================================== Binary files. No diff available.

1 0

svn commit: r1039 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/turbo test/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 29 Nov '06

29 Nov '06

Author: ceki Date: Wed Nov 29 21:15:45 2006 New Revision: 1039 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java Log: - The setMarker now takes a string instead of Marker. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java Wed Nov 29 21:15:45 2006 @@ -1,6 +1,7 @@ package ch.qos.logback.classic.turbo; import org.slf4j.Marker; +import org.slf4j.MarkerFactory; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -44,7 +45,9 @@ * * @param marker2Match */ - public void setMarker(Marker marker2Match) { - this.marker2Match = marker2Match; + public void setMarker(String markerStr) { + if(markerStr != null) { + this.marker2Match = MarkerFactory.getMarker(markerStr); + } } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java Wed Nov 29 21:15:45 2006 @@ -36,7 +36,7 @@ public void testBasic() { MarkerFilter mkt = new MarkerFilter(); - mkt.setMarker(totoMarker); + mkt.setMarker(MARKER_NAME); mkt.setOnMatch("ACCEPT"); mkt.setOnMismatch("DENY");

1 0

svn commit: r1038 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/turbo test/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 29 Nov '06

29 Nov '06

Author: ceki Date: Wed Nov 29 20:58:24 2006 New Revision: 1038 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java - copied, changed from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java - copied, changed from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingFilter.java - copied, changed from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java - copied, changed from r1036, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java Removed: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java Log: shorter names Copied: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java (from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java) ============================================================================== --- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java Wed Nov 29 20:58:24 2006 @@ -27,7 +27,7 @@ * @author Ceki Gülcü * @author Sébastien Pennec */ -public class MDCTurboFilter extends MatchingTurboFilter { +public class MDCFilter extends MatchingFilter { String MDCKey; String value; Copied: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java (from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java) ============================================================================== --- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerFilter.java Wed Nov 29 20:58:24 2006 @@ -9,7 +9,7 @@ /** * Checks whether the marker in the event matches the marker specified by the user as a property. */ -public class MarkerTurboFilter extends MatchingTurboFilter { +public class MarkerFilter extends MatchingFilter { Marker marker2Match; Copied: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingFilter.java (from r1036, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java) ============================================================================== --- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingFilter.java Wed Nov 29 20:58:24 2006 @@ -8,7 +8,7 @@ * * @author Ceki Gulcu */ -public abstract class MatchingTurboFilter extends TurboFilter { +public abstract class MatchingFilter extends TurboFilter { protected FilterReply onMatch = FilterReply.NEUTRAL; protected FilterReply onMismatch = FilterReply.NEUTRAL; Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java (from r1036, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerFilterTest.java Wed Nov 29 20:58:24 2006 @@ -7,13 +7,13 @@ import junit.framework.TestCase; -public class MarkerTurboFilterTest extends TestCase { +public class MarkerFilterTest extends TestCase { static String MARKER_NAME = "toto"; Marker totoMarker = MarkerFactory.getMarker(MARKER_NAME); - public MarkerTurboFilterTest(String arg0) { + public MarkerFilterTest(String arg0) { super(arg0); } @@ -26,7 +26,7 @@ } public void testNoMarker() { - MarkerTurboFilter mkt = new MarkerTurboFilter(); + MarkerFilter mkt = new MarkerFilter(); mkt.start(); assertFalse(mkt.isStarted()); assertEquals(FilterReply.NEUTRAL, mkt.decide(totoMarker, null, null, null, null, null)); @@ -35,7 +35,7 @@ } public void testBasic() { - MarkerTurboFilter mkt = new MarkerTurboFilter(); + MarkerFilter mkt = new MarkerFilter(); mkt.setMarker(totoMarker); mkt.setOnMatch("ACCEPT"); mkt.setOnMismatch("DENY"); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java Wed Nov 29 20:58:24 2006 @@ -18,7 +18,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(MarkerTurboFilterTest.class); + suite.addTestSuite(MarkerFilterTest.class); return suite; } } \ No newline at end of file

1 0

svn commit: r1037 - logback/trunk/logback-core
by noreply.ceki＠qos.ch 29 Nov '06

29 Nov '06

Author: ceki Date: Wed Nov 29 20:53:04 2006 New Revision: 1037 Removed: logback/trunk/logback-core/build.properties logback/trunk/logback-core/build.xml Log: - removing unused files

1 0

svn commit: r1036 - in logback/trunk/logback-classic: . lib src/main/java/ch/qos/logback/classic/turbo src/test/java/ch/qos/logback/classic src/test/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 29 Nov '06

29 Nov '06

Author: ceki Date: Wed Nov 29 20:51:05 2006 New Revision: 1036 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DebugUsersTurboFilter.java - copied unchanged from r1035, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DebugUsersTurboFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java Removed: logback/trunk/logback-classic/build.properties logback/trunk/logback-classic/build.xml logback/trunk/logback-classic/lib/ logback/trunk/logback-classic/mdcfilter.xml logback/trunk/logback-classic/site.xml logback/trunk/logback-classic/slf4j.xml logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DebugUsersTurboFilter.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Log: - removed a bunch of unused jars and other files. - Added MatchingTurboFilter which takes over some responsability from TurboFilter - Added corresponding test cases Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java Wed Nov 29 20:51:05 2006 @@ -27,7 +27,7 @@ * @author Ceki Gülcü * @author Sébastien Pennec */ -public class MDCTurboFilter extends TurboFilter { +public class MDCTurboFilter extends MatchingTurboFilter { String MDCKey; String value; Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MarkerTurboFilter.java Wed Nov 29 20:51:05 2006 @@ -0,0 +1,50 @@ +package ch.qos.logback.classic.turbo; + +import org.slf4j.Marker; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.core.spi.FilterReply; + +/** + * Checks whether the marker in the event matches the marker specified by the user as a property. + */ +public class MarkerTurboFilter extends MatchingTurboFilter { + + Marker marker2Match; + + @Override + public void start() { + if(marker2Match != null) { + super.start(); + } else { + addError("The marker property must be set for ["+getName()+"]"); + } + } + + @Override + public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { + if(!isStarted()) { + return FilterReply.NEUTRAL; + } + + if(marker == null) { + return onMismatch; + } + + if(marker2Match.contains(marker)) { + return onMatch; + } else { + return onMismatch; + } + } + + /** + * The marker to match in the event. + * + * @param marker2Match + */ + public void setMarker(Marker marker2Match) { + this.marker2Match = marker2Match; + } +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MatchingTurboFilter.java Wed Nov 29 20:51:05 2006 @@ -0,0 +1,35 @@ +package ch.qos.logback.classic.turbo; + +import ch.qos.logback.core.spi.FilterReply; + +/** + * An abstract class containing support for {@link #onMatch} on {@link #onMismatch} + * attributes, shared by many but not all tubo filters. + * + * @author Ceki Gulcu + */ +public abstract class MatchingTurboFilter extends TurboFilter { + + protected FilterReply onMatch = FilterReply.NEUTRAL; + protected FilterReply onMismatch = FilterReply.NEUTRAL; + + final public void setOnMatch(String action) { + if ("NEUTRAL".equals(action)) { + onMatch = FilterReply.NEUTRAL; + } else if ("ACCEPT".equals(action)) { + onMatch = FilterReply.ACCEPT; + } else if ("DENY".equals(action)) { + onMatch = FilterReply.DENY; + } + } + + final public void setOnMismatch(String action) { + if ("NEUTRAL".equals(action)) { + onMismatch = FilterReply.NEUTRAL; + } else if ("ACCEPT".equals(action)) { + onMismatch = FilterReply.ACCEPT; + } else if ("DENY".equals(action)) { + onMismatch = FilterReply.DENY; + } + } +} Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java Wed Nov 29 20:51:05 2006 @@ -9,9 +9,9 @@ import ch.qos.logback.core.spi.LifeCycle; /** - * TurboFilter is a specialized filter with a decide method that takes a bunch of parameters - * instead of a single event object. The latter is cleaner but the latter is much more - * performant. + * TurboFilter is a specialized filter with a decide method that takes a bunch + * of parameters instead of a single event object. The latter is cleaner but + * the latter is much more performant. * * @author Ceki Gulcu */ @@ -19,9 +19,7 @@ private String name; boolean start = false; - protected FilterReply onMatch = FilterReply.NEUTRAL; - protected FilterReply onMismatch = FilterReply.NEUTRAL; - + /** * Points to the next filter in the filter chain. @@ -51,12 +49,10 @@ public boolean isStarted() { return this.start; } - + public void stop() { this.start = false; } - - /** * Set the next filter pointer. */ @@ -78,25 +74,4 @@ public void setName(String name) { this.name = name; } - - final public void setOnMatch(String action) { - if ("NEUTRAL".equals(action)) { - onMatch = FilterReply.NEUTRAL; - } else if ("ACCEPT".equals(action)) { - onMatch = FilterReply.ACCEPT; - } else if ("DENY".equals(action)) { - onMatch = FilterReply.DENY; - } - } - - final public void setOnMismatch(String action) { - if ("NEUTRAL".equals(action)) { - onMismatch = FilterReply.NEUTRAL; - } else if ("ACCEPT".equals(action)) { - onMismatch = FilterReply.ACCEPT; - } else if ("DENY".equals(action)) { - onMismatch = FilterReply.DENY; - } - } - } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Wed Nov 29 20:51:05 2006 @@ -28,6 +28,7 @@ suite.addTest(ch.qos.logback.classic.pattern.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.db.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.spi.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.turbo.PackageTest.suite()); return suite; } } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/MarkerTurboFilterTest.java Wed Nov 29 20:51:05 2006 @@ -0,0 +1,49 @@ +package ch.qos.logback.classic.turbo; + +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; + +import ch.qos.logback.core.spi.FilterReply; + +import junit.framework.TestCase; + +public class MarkerTurboFilterTest extends TestCase { + + static String MARKER_NAME = "toto"; + + Marker totoMarker = MarkerFactory.getMarker(MARKER_NAME); + + public MarkerTurboFilterTest(String arg0) { + super(arg0); + } + + protected void setUp() throws Exception { + super.setUp(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testNoMarker() { + MarkerTurboFilter mkt = new MarkerTurboFilter(); + mkt.start(); + assertFalse(mkt.isStarted()); + assertEquals(FilterReply.NEUTRAL, mkt.decide(totoMarker, null, null, null, null, null)); + assertEquals(FilterReply.NEUTRAL, mkt.decide(null, null, null, null, null, null)); + + } + + public void testBasic() { + MarkerTurboFilter mkt = new MarkerTurboFilter(); + mkt.setMarker(totoMarker); + mkt.setOnMatch("ACCEPT"); + mkt.setOnMismatch("DENY"); + + mkt.start(); + assertTrue(mkt.isStarted()); + assertEquals(FilterReply.DENY, mkt.decide(null, null, null, null, null, null)); + assertEquals(FilterReply.ACCEPT, mkt.decide(totoMarker, null, null, null, null, null)); + } + +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java Wed Nov 29 20:51:05 2006 @@ -0,0 +1,24 @@ +/** + * 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.classic.turbo; + + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(MarkerTurboFilterTest.class); + return suite; + } +} \ No newline at end of file

1 0

svn commit: r1035 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo
by noreply.seb＠qos.ch 29 Nov '06

29 Nov '06

Author: seb Date: Wed Nov 29 19:30:29 2006 New Revision: 1035 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java Removed: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java Log: Modified UserTurboFilter Now using MDCTurboFilter Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/MDCTurboFilter.java Wed Nov 29 19:30:29 2006 @@ -0,0 +1,56 @@ +package ch.qos.logback.classic.turbo; + +import org.slf4j.Marker; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.MDC; +import ch.qos.logback.core.spi.FilterReply; + +/** + * This class allows output for a given MDC value. + * + * When the given value is identified by this TubroFilter, + * the reply is based on the OnMatch option. + * The information is taken from the MDC. For this TurboFilter to work, + * one must set the key that will be used to + * access the information in the MDC. + * + * To allow output for the value, set the OnMatch option + * to ACCEPT. To disable output for the given value, set + * the OnMatch option to DENY. + * + * By default, values of the OnMatch and OnMisMatch + * options are NEUTRAL. + * + * + * @author Ceki Gülcü + * @author Sébastien Pennec + */ +public class MDCTurboFilter extends TurboFilter { + + String MDCKey; + String value; + + @Override + public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { + if (MDCKey == null) { + return FilterReply.NEUTRAL; + } + + String value = MDC.get(MDCKey); + if (this.value.equals(value)) { + return onMatch; + } + return onMismatch; + } + + public void setValue(String value) { + this.value = value; + } + + public void setMDCKey(String MDCKey) { + this.MDCKey = MDCKey; + } + +}

1 0

svn commit: r1034 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty
by noreply.seb＠qos.ch 29 Nov '06

29 Nov '06

Author: seb Date: Wed Nov 29 19:16:40 2006 New Revision: 1034 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Log: Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Wed Nov 29 19:16:40 2006 @@ -174,7 +174,7 @@ StatusPrinter.print(getStatusManager()); } - public void stop() throws Exception { + public void stop() { aai.detachAndStopAllAppenders(); }

1 0

svn commit: r1033 - logback/trunk/logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 29 Nov '06

29 Nov '06

Author: seb Date: Wed Nov 29 16:14:10 2006 New Revision: 1033 Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Log: Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Wed Nov 29 16:14:10 2006 @@ -2494,7 +2494,7 @@ you send them to us, we will gladly include missing scripts in future releases. </p> - <p>The <em>access_event</em> table's XXXXXX are described below:</p> + <p>The <em>access_event</em> table's fields are described below:</p> <table> <tr> @@ -2586,11 +2586,10 @@ </tr> </table> - - - - <a name="AccessSyslogAppender"/> - <h3>SyslogAppender</h3> + <p> + The options of access' <code>DBAppender</code> are the same as those available + for classc's <code>DBAppender</code>. + </p> </body> </document> \ No newline at end of file

1 0

svn commit: r1032 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/db/dialect logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 29 Nov '06

29 Nov '06

Author: seb Date: Wed Nov 29 15:35:43 2006 New Revision: 1032 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mysql.sql logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/index.xml Log: Manual improvements Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mysql.sql ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mysql.sql (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mysql.sql Wed Nov 29 15:35:43 2006 @@ -31,7 +31,7 @@ ( event_id INT NOT NULL, header_key VARCHAR(254) NOT NULL, - header_value TEXT, + header_value VARCHAR(1024), PRIMARY KEY(event_id, header_key), FOREIGN KEY (event_id) REFERENCES access_event(event_id) ); Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Wed Nov 29 15:35:43 2006 @@ -2402,7 +2402,7 @@ <p> When testing this configuration, one should verify that the remote syslog daemon - accepts TCP requests from an external source. Experience shows that syslog daemons + accepts requests from an external source. Experience shows that syslog daemons usually deny such requests by default. </p> @@ -2413,19 +2413,34 @@ <p> Most of the appenders found in logback classic can be used within logback access. They function mostly in the same way as their logback - classic counterpart. Precise documentation about these appenders will - follow. + classic counterpart. In the next section, we will cover their use, but will + focuse on the differences with the classic appenders. </p> - - + + <p> + The <a href="../xref/ch/qos/logback/access/net/SocketAppender.html"> + <code>SocketAppender</code></a> is designed to log to a + remote entity by transmitting serialized <code>AccessEvent</code> objects over the wire. + Remote logging is non-intrusive as far as the access event is concerned. + On the receiving end after de-serialization, the event can be logged as + if it were generated locally. + </p> + <p> + The options of access' <code>SocketAppender</code> are the same as those available + for classc's <code>SocketAppender</code>. + </p> + + <a name="AccessSMTPAppender"/> <h3>SMTPAppender</h3> <p> - Access' <code>SMTPAppender</code> works in the same way as its Classic counterpart. - However, the evaluator is rather different. By default, the <code>URLEvaluator</code> + Access' <a href="../xref/ch/qos/logback/access/net/SMTPAppender.html"> + <code>SMTPAppender</code></a> works in the same way as its Classic counterpart. + However, the <span class="option">evaluator</span> option is rather different. + By default, a <code>URLEvaluator</code> object is used by <code>SMTPAppender</code>. This evaluator contains a list of URLs that are checked agains the current request's URL. When one of the pages given to the <code>URLEvaluator</code> is requested, <code>SMTPAppender</code> sends an email. @@ -2449,12 +2464,133 @@ <SMTPHost>mail.domain.com</SMTPHost> <To>recipient_email(a)host.com</To> </appender></pre></div> + + <p> + This way of triggering the email lets user select pages that are important steps + in a specific process, for example. + When such a page is accessed, the email is sent with the pages + that were accessed previously, and any information the user wants to be included + in the email. + </p> + - </body> </document> \ No newline at end of file Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/index.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/index.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/index.xml Wed Nov 29 15:35:43 2006 @@ -55,10 +55,6 @@ the aid of introductory material and many examples, new users should quickly come up to speed. </p> - - - - <div> <p>Without further ado, here are the contents of the manual:</p>

1 0