November 2006 - logback-dev

svn commit: r931 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi
by noreply.ceki＠qos.ch 17 Nov '06

17 Nov '06

Author: ceki Date: Fri Nov 17 11:03:07 2006 New Revision: 931 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Log: - indentation changes in AppenderAttachableImpl Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Fri Nov 17 11:03:07 2006 @@ -22,139 +22,139 @@ */ public class AppenderAttachableImpl implements AppenderAttachable { - final private List<Appender> appenderList = new ArrayList<Appender>(); + final private List<Appender> appenderList = new ArrayList<Appender>(); - /** - * Attach an appender. If the appender is already in the list in won't be - * added again. - */ - public void addAppender(Appender newAppender) { - // Null values for newAppender parameter are strictly forbidden. - if (newAppender == null) { - throw new IllegalArgumentException("Cannot null as an appener"); - } - if (!appenderList.contains(newAppender)) { - appenderList.add(newAppender); - } - } - - /** - * Call the <code>doAppend</code> method on all attached appenders. - */ - public int appendLoopOnAppenders(Object o) { - int size = 0; - Appender appender; - - size = appenderList.size(); - for (int i = 0; i < size; i++) { - appender = (Appender) appenderList.get(i); - appender.doAppend(o); - } - return size; - } - - /** - * Get all attached appenders as an Enumeration. If there are no attached - * appenders <code>null</code> is returned. - * - * @return Enumeration An enumeration of attached appenders. - */ - public Iterator iteratorForAppenders() { - return appenderList.iterator(); - } - - /** - * Look for an attached appender named as <code>name</code>. - * - * - * Return the appender with that name if in the list. Return null otherwise. - * - */ - public Appender getAppender(String name) { - if (name == null) { - return null; - } - - int size = appenderList.size(); - Appender appender; - - for (int i = 0; i < size; i++) { - appender = (Appender) appenderList.get(i); - - if (name.equals(appender.getName())) { - return appender; - } - } - - return null; - } - - /** - * Returns <code>true</code> if the specified appender is in the list of - * attached appenders, <code>false</code> otherwise. - * - * @since 1.2 - */ - public boolean isAttached(Appender appender) { - if (appender == null) { - return false; - } - - int size = appenderList.size(); - Appender a; - - for (int i = 0; i < size; i++) { - a = (Appender) appenderList.get(i); - - if (a == appender) { - return true; - } - } - - return false; - } - - /** - * Remove and stop all previously attached appenders. - */ - public void detachAndStopAllAppenders() { - int len = appenderList.size(); - - for (int i = 0; i < len; i++) { - Appender a = (Appender) appenderList.get(i); - a.stop(); - } - - appenderList.clear(); - } - - /** - * Remove the appender passed as parameter form the list of attached - * appenders. - */ - public boolean detachAppender(Appender appender) { - if (appender == null) { - return false; - } - return appenderList.remove(appender); - } - - /** - * Remove the appender with the name passed as parameter form the list of - * appenders. - */ - public Appender detachAppender(String name) { - if (name == null) { - return null; - } - - int size = appenderList.size(); - - for (int i = 0; i < size; i++) { - if (name.equals(((Appender) appenderList.get(i)).getName())) { - return (Appender) appenderList.remove(i); - } - } - return null; - } + /** + * Attach an appender. If the appender is already in the list in won't be + * added again. + */ + public void addAppender(Appender newAppender) { + // Null values for newAppender parameter are strictly forbidden. + if (newAppender == null) { + throw new IllegalArgumentException("Cannot null as an appener"); + } + if (!appenderList.contains(newAppender)) { + appenderList.add(newAppender); + } + } + + /** + * Call the <code>doAppend</code> method on all attached appenders. + */ + public int appendLoopOnAppenders(Object o) { + int size = 0; + Appender appender; + + size = appenderList.size(); + for (int i = 0; i < size; i++) { + appender = (Appender) appenderList.get(i); + appender.doAppend(o); + } + return size; + } + + /** + * Get all attached appenders as an Enumeration. If there are no attached + * appenders <code>null</code> is returned. + * + * @return Enumeration An enumeration of attached appenders. + */ + public Iterator iteratorForAppenders() { + return appenderList.iterator(); + } + + /** + * Look for an attached appender named as <code>name</code>. + * + * + * Return the appender with that name if in the list. Return null otherwise. + * + */ + public Appender getAppender(String name) { + if (name == null) { + return null; + } + + int size = appenderList.size(); + Appender appender; + + for (int i = 0; i < size; i++) { + appender = (Appender) appenderList.get(i); + + if (name.equals(appender.getName())) { + return appender; + } + } + + return null; + } + + /** + * Returns <code>true</code> if the specified appender is in the list of + * attached appenders, <code>false</code> otherwise. + * + * @since 1.2 + */ + public boolean isAttached(Appender appender) { + if (appender == null) { + return false; + } + + int size = appenderList.size(); + Appender a; + + for (int i = 0; i < size; i++) { + a = (Appender) appenderList.get(i); + + if (a == appender) { + return true; + } + } + + return false; + } + + /** + * Remove and stop all previously attached appenders. + */ + public void detachAndStopAllAppenders() { + int len = appenderList.size(); + + for (int i = 0; i < len; i++) { + Appender a = (Appender) appenderList.get(i); + a.stop(); + } + + appenderList.clear(); + } + + /** + * Remove the appender passed as parameter form the list of attached + * appenders. + */ + public boolean detachAppender(Appender appender) { + if (appender == null) { + return false; + } + return appenderList.remove(appender); + } + + /** + * Remove the appender with the name passed as parameter form the list of + * appenders. + */ + public Appender detachAppender(String name) { + if (name == null) { + return null; + } + + int size = appenderList.size(); + + for (int i = 0; i < size; i++) { + if (name.equals(((Appender) appenderList.get(i)).getName())) { + return (Appender) appenderList.remove(i); + } + } + return null; + } }

1 0

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

17 Nov '06

Author: ceki Date: Fri Nov 17 11:02:48 2006 New Revision: 930 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java Log: - indentation changes in AppenderAttachableImpl Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java Fri Nov 17 11:02:48 2006 @@ -47,8 +47,11 @@ } private int statusRepeatCount = 0; - static final int ALLOWED_REPEATS = 3; + private int exceptionCount = 0; + + static final int ALLOWED_REPEATS = 5; + public synchronized void doAppend(Object eventObject) { // WARNING: The guard check MUST be the first statement in the // doAppend() method. @@ -77,7 +80,11 @@ // ok, we now invoke derived class' implementation of append this.append(eventObject); - } finally { + } catch(Exception e) { + if (exceptionCount++ < ALLOWED_REPEATS) { + addError("Appender ["+name+"] failed to append.", e); + } + } finally { guard = false; } }

1 0

svn commit: r929 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/read test/java/ch/qos/logback/core/appender
by noreply.ceki＠qos.ch 17 Nov '06

17 Nov '06

Author: ceki Date: Fri Nov 17 10:59:23 2006 New Revision: 929 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ListAppender.java - copied, changed from r909, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ListAppender.java Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ListAppender.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java Log: moved ListAppender from test to main Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java Fri Nov 17 10:59:23 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.read; import ch.qos.logback.core.AppenderBase; Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ListAppender.java (from r909, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ListAppender.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ListAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ListAppender.java Fri Nov 17 10:59:23 2006 @@ -7,7 +7,7 @@ * modify it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation. */ -package ch.qos.logback.core.appender; +package ch.qos.logback.core.read; import java.util.ArrayList; import java.util.List;

1 0

svn commit: r928 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read
by noreply.ceki＠qos.ch 17 Nov '06

17 Nov '06

Author: ceki Date: Fri Nov 17 10:58:01 2006 New Revision: 928 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java Log: inital version of CyclicBufferAppender Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java Fri Nov 17 10:58:01 2006 @@ -0,0 +1,52 @@ +package ch.qos.logback.core.read; + +import ch.qos.logback.core.AppenderBase; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.helpers.CyclicBuffer; + +public class CyclicBufferAppender extends AppenderBase { + + + CyclicBuffer cb; + int maxSize = 512; + + public void start() { + + cb = new CyclicBuffer(maxSize); + super.start(); + } + + + @Override + protected void append(Object eventObject) { + if(!isStarted()) { + return; + } + cb.add(eventObject); + } + + int getLength() { + return cb.length(); + } + + Object get(int i) { + return cb.get(i); + } + + + public Layout getLayout() { + return null; + } + + public void setLayout(Layout layout) { + } + + public int getMaxSize() { + return maxSize; + } + + public void setMaxSize(int maxSize) { + this.maxSize = maxSize; + } + +}

1 0

svn commit: r927 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read
by noreply.ceki＠qos.ch 17 Nov '06

17 Nov '06

Author: ceki Date: Fri Nov 17 10:57:59 2006 New Revision: 927 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ Log: inital version of CyclicBufferAppender

1 0

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

17 Nov '06

Author: seb Date: Fri Nov 17 09:57:44 2006 New Revision: 926 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java Log: One can now specify the key to retrieve user information from the MDC Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java Fri Nov 17 09:57:44 2006 @@ -13,6 +13,10 @@ * * When the given user is identified by this TubroFilter, * the reply is based on the OnMatch option. + * The information is taken from the MDC. By default, + * the key used to retrieve the user information is "user". + * One can optionnally set the key that will be used to + * access the user information in the MDC. * * To allow output for a user, set the OnMatch option * to ACCEPT. To disable output for the given user, set @@ -20,18 +24,20 @@ * * By default, values of the OnMatch and OnMisMatch * options are NEUTRAL. + * * * @author Ceki Gülcü * @author Sébastien Pennec */ public class UserTurboFilter extends TurboFilter { + String MDCKey = ClassicGlobal.USER_MDC_KEY; String user; @Override public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { - String user = MDC.get(ClassicGlobal.USER_MDC_KEY); + String user = MDC.get(MDCKey); if (this.user.equals(user)) { return onMatch; } @@ -41,5 +47,9 @@ public void setUser(String user) { this.user = user; } + + public void setMDCKey(String MDCKey) { + this.MDCKey = MDCKey; + } }

1 0

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

17 Nov '06

Author: seb Date: Fri Nov 17 09:51:45 2006 New Revision: 925 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java Log: Added support for OnMatch and OnMismatch options in TurboFilter Added a new TurboFilter: UserTurboFilter 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 Fri Nov 17 09:51:45 2006 @@ -4,7 +4,6 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; -import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.spi.LifeCycle; @@ -19,7 +18,10 @@ public abstract class TurboFilter extends ContextAwareBase implements LifeCycle { private String name; - boolean start = false; + boolean start = false; + protected FilterReply onMatch = FilterReply.NEUTRAL; + protected FilterReply onMismatch = FilterReply.NEUTRAL; + /** * Points to the next filter in the filter chain. @@ -28,8 +30,8 @@ /** * Make a decision based on the multiple parameters passed as arguments. - * The returned value should be one of <code>{@link Filter#DENY}</code>, - * <code>{@link Filter#NEUTRAL}</code>, or <code>{@link Filter#ACCEPT}</code>. + * The returned value should be one of <code>{@link FilterReply#DENY}</code>, + * <code>{@link FilterReply#NEUTRAL}</code>, or <code>{@link FilterReply#ACCEPT}</code>. * @param marker * @param logger @@ -76,5 +78,25 @@ 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; + } + } } Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/UserTurboFilter.java Fri Nov 17 09:51:45 2006 @@ -0,0 +1,45 @@ +package ch.qos.logback.classic.turbo; + +import org.slf4j.Marker; + +import ch.qos.logback.classic.ClassicGlobal; +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 user. + * + * When the given user is identified by this TubroFilter, + * the reply is based on the OnMatch option. + * + * To allow output for a user, set the OnMatch option + * to ACCEPT. To disable output for the given user, 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 UserTurboFilter extends TurboFilter { + + String user; + + @Override + public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { + + String user = MDC.get(ClassicGlobal.USER_MDC_KEY); + if (this.user.equals(user)) { + return onMatch; + } + return onMismatch; + } + + public void setUser(String user) { + this.user = user; + } + +}

1 0

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

15 Nov '06

Author: seb Date: Wed Nov 15 19:01:40 2006 New Revision: 924 Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml logback/trunk/src/site/ (props changed) logback/trunk/src/site/site.xml Log: skin version corrected appenders.xml is now well formed... 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 15 19:01:40 2006 @@ -1,4 +1,5 @@ -  - - - - - - - </body> -</document> +</document> \ No newline at end of file Modified: logback/trunk/src/site/site.xml ============================================================================== --- logback/trunk/src/site/site.xml (original) +++ logback/trunk/src/site/site.xml Wed Nov 15 19:01:40 2006 @@ -4,7 +4,7 @@ <skin> <groupId>ch.qos.logback</groupId> <artifactId>logback-skin</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </skin> <!-- <publishDate position="navigation-bottom" format="dd-MM-yyyy"/>

1 0

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

15 Nov '06

Author: seb Date: Wed Nov 15 18:54:02 2006 New Revision: 923 Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Log: updated figures 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 15 18:54:02 2006 @@ -2131,7 +2131,7 @@ single configuration file and shared by logback and other frameworks. - + The third implementation of <code>ConnectionSource</code> that is shipped with @@ -2204,7 +2206,7 @@ Experiment shows that using connection pooling with <code>DBAppender</code> - gives a big boost to the process' performance. With the following + gives a big performance boost. With the following configuration file, logging events are sent to a MySQL database, without any pooling. @@ -2231,7 +2233,8 @@ With this configuration file, sending 500 logging events to - a MySQL database takes a whopping 22 seconds. This figure is absolutely + a MySQL database takes a whopping 5 seconds, that is + 10 miliseconds per requests. This figure is unacceptable when dealing with large applications. @@ -2267,8 +2270,9 @@ With this new configuration, sending 500 logging requests to - the same MySQL database as previously used takes no more than 5 seconds. - The gain is a 4.4 factor. + the same MySQL database as previously used takes around 0.5 seconds, + for an average time of 1 milisecond per request. + The gain is a 10 factor. <a name="SyslogAppender" />

1 0

svn commit: r922 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/net logback-access/src/test/java/ch/qos/logback/access/net logback-access/src/test/java/ch/qos/logback/access/pattern/helpers logback-classic/src/main/java/ch/qos/logback/classic/net logback-classic/src/test/java/ch/qos/logback/classic/net logback-core/src/main/java/ch/qos/logback/core/net logback-examples/src/main/java/chapter4/mail logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 15 Nov '06

15 Nov '06

Author: seb Date: Wed Nov 15 17:18:02 2006 New Revision: 922 Added: logback/trunk/logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java - copied, changed from r921, /logback/trunk/logback-examples/src/main/java/chapter4/mail/CounterBasedTP.java Removed: logback/trunk/logback-examples/src/main/java/chapter4/mail/CounterBasedTP.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java logback/trunk/logback-examples/src/main/java/chapter4/mail/mail3.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Log: changed SMTPAppender triggering policy to evluator, updated examples, doc and tests Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java Wed Nov 15 17:18:02 2006 @@ -1,39 +1,24 @@ package ch.qos.logback.access.net; import ch.qos.logback.access.boolex.JaninoEventEvaluator; -import ch.qos.logback.core.Context; -import ch.qos.logback.core.boolex.EvaluationException; public class DefaultSMTPEvaluator extends JaninoEventEvaluator { - private static final long ONE_DAY = 1000*60*60*24; - private long LAST_TRIGGER_DATE = 0L; + private String url; - public DefaultSMTPEvaluator(Context context) { - this.context = context; - setName("SMTPAppender's default event evaluator"); - setExpression("event.getStatusCode() >= 500"); + public DefaultSMTPEvaluator() { } - - /** - * Is this <code>event</code> the e-mail triggering event? - * - * - * This method returns <code>true</code>, if the event is - * evaluated to true. Otherwise it returns <code>false</code>. - * - * Once an email is sent, the next one will not be sent unless a certain amount - * of time passed. - */ + + public void setUrl(String url) { + this.url = url; + } + @Override - public boolean evaluate(Object event) throws EvaluationException { - - if (super.evaluate(event)) { - if (System.currentTimeMillis() >= LAST_TRIGGER_DATE + ONE_DAY) { - LAST_TRIGGER_DATE = System.currentTimeMillis(); - return true; - } + public void start() { + if (getContext() == null) { + System.out.println("CONTEXT NULL"); } - return false; + setExpression("request.getRequestURL().toString().contains(\"" + url + "\")"); + super.start(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java Wed Nov 15 17:18:02 2006 @@ -51,8 +51,6 @@ * ERROR or higher. */ public SMTPAppender() { - DefaultSMTPEvaluator evaluator = new DefaultSMTPEvaluator(getContext()); - setEventEvaluator(evaluator); } /** @@ -62,12 +60,6 @@ public SMTPAppender(EventEvaluator evaluator) { this.eventEvaluator = evaluator; } - - @Override - public void start() { - ((DefaultSMTPEvaluator) eventEvaluator).start(); - super.start(); - } /** * Perform SMTPAppender specific appending actions, mainly adding the event to Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java Wed Nov 15 17:18:02 2006 @@ -11,7 +11,7 @@ public class DefaultSMTPEvaluatorTest extends TestCase { - + final String expectedURL = "testUrl"; Context context = new ContextBase(); DefaultSMTPEvaluator evaluator; DummyRequest request; @@ -19,7 +19,9 @@ DummyServerAdapter serverAdapter; public void setUp() throws Exception { - evaluator = new DefaultSMTPEvaluator(context); + evaluator = new DefaultSMTPEvaluator(); + evaluator.setContext(context); + evaluator.setUrl(expectedURL); evaluator.start(); request = new DummyRequest(); response = new DummyResponse(); @@ -37,25 +39,14 @@ } public void testExpectFalseBecauseOfStatus() throws EvaluationException { + request.setRequestUrl("test"); AccessEvent ae = new AccessEvent(request, response, serverAdapter); - response.setStatus(100); assertFalse(evaluator.evaluate(ae)); } public void testExpectTrue() throws EvaluationException { + request.setRequestUrl(expectedURL); AccessEvent ae = new AccessEvent(request, response, serverAdapter); - response.setStatus(500); assertTrue(evaluator.evaluate(ae)); } - - public void testExpectFalseBecauseOfTime() throws EvaluationException { - AccessEvent ae = new AccessEvent(request, response, serverAdapter); - response.setStatus(500); - //this returns true and sets the time - evaluator.evaluate(ae); - //this should return false because 24h have not passed yet. - assertFalse(evaluator.evaluate(ae)); - } - - } Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java Wed Nov 15 17:18:02 2006 @@ -18,6 +18,7 @@ public class DummyRequest implements HttpServletRequest { Hashtable<String, String> headerNames; + String url; public DummyRequest() { headerNames = new Hashtable<String, String>(); @@ -83,7 +84,7 @@ } public StringBuffer getRequestURL() { - return null; + return new StringBuffer(url); } public String getRequestedSessionId() { @@ -243,4 +244,8 @@ public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException { } + + public void setRequestUrl(String url) { + this.url = url; + } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java Wed Nov 15 17:18:02 2006 @@ -57,12 +57,6 @@ public SMTPAppender(EventEvaluator eventEvaluator) { this.eventEvaluator = eventEvaluator; } - - @Override - public void start() { - ((JaninoEventEvaluator) eventEvaluator).start(); - super.start(); - } /** * Perform SMTPAppender specific appending actions, mainly adding the event to Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Wed Nov 15 17:18:02 2006 @@ -75,7 +75,7 @@ } public void setTriggeringPolicy() { - appender.setEventEvaluator(null); + appender.setEvaluator(null); appender.checkEntryConditions(); assertEquals(1, appender.getContext().getStatusManager().getCount()); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Wed Nov 15 17:18:02 2006 @@ -87,8 +87,6 @@ subjectLayout = makeSubjectLayout(subjectStr); - - started = true; } catch (MessagingException e) { @@ -284,7 +282,7 @@ * interface. A corresponding object will be instantiated and assigned as the * event evaluator for the SMTPAppender. */ - public void setEventEvaluator(EventEvaluator eventEvaluator) { + public void setEvaluator(EventEvaluator eventEvaluator) { this.eventEvaluator = eventEvaluator; } Copied: logback/trunk/logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java (from r921, /logback/trunk/logback-examples/src/main/java/chapter4/mail/CounterBasedTP.java) ============================================================================== --- /logback/trunk/logback-examples/src/main/java/chapter4/mail/CounterBasedTP.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java Wed Nov 15 17:18:02 2006 @@ -10,20 +10,22 @@ package chapter4.mail; -import java.io.File; -import ch.qos.logback.core.rolling.TriggeringPolicyBase; - +import ch.qos.logback.core.boolex.EvaluationException; +import ch.qos.logback.core.boolex.EventEvaluator; +import ch.qos.logback.core.spi.ContextAwareBase; /** - * A simple TriggeringPolicy implementation that triggers - * email transmission after 1024 events regardless of event level. - * */ -public class CounterBasedTP extends TriggeringPolicyBase { - boolean started; + * A simple EventEvaluator implementation that triggers email transmission after + * 1024 events regardless of event level. + */ +public class CounterBasedEvaluator extends ContextAwareBase implements EventEvaluator { + static int LIMIT = 1024; int counter = 0; + String name; - public boolean isTriggeringEvent(File activeFile, Object event) { + public boolean evaluate(Object event) throws NullPointerException, + EvaluationException { counter++; if (counter == LIMIT) { @@ -34,4 +36,12 @@ return false; } } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } Modified: logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/EMail.java Wed Nov 15 17:18:02 2006 @@ -15,6 +15,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.util.StatusPrinter; @@ -38,7 +39,7 @@ lc.shutdownAndReset(); configurator.setContext(lc); configurator.doConfigure(configFile); - //StatusPrinter.print(lc); + StatusPrinter.print(lc); } Logger logger = LoggerFactory.getLogger(EMail.class); Modified: logback/trunk/logback-examples/src/main/java/chapter4/mail/mail3.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/mail/mail3.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/mail3.xml Wed Nov 15 17:18:02 2006 @@ -7,7 +7,7 @@ <configuration> <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> - <TriggeringPolicy class="chapter4.mail.CounterBasedTP" /> + <Evaluator class="chapter4.mail.CounterBasedEvaluator" /> <BufferSize>1050</BufferSize> <SMTPHost>${smtpHost}</SMTPHost> <To>${to}</To> 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 15 17:18:02 2006 @@ -1,4 +1,3 @@ -<document> <!-- Warning: do not use any auto-format function on this file. @@ -1534,20 +1533,20 @@ </td> </tr> <tr> - <td>TriggeringPolicy</td> + <td>Evaluator</td> <td><code>String</code></td> <td> - This option is declared by creating a new <code><TriggeringPolicy/></code> + This option is declared by creating a new <code><EventEvaluator/></code> element. The name of the class that the user wishes to use as the - <code>SMTPAppender</code>'s <code>TriggeringPolicy</code> can be given + <code>SMTPAppender</code>'s <code>Evaluator</code> can be given by adding an attribute to the newly created element. - More details about the use of triggering policies with <code>SMTPAppender</code> + More details about the use of event evaluators with <code>SMTPAppender</code> follow further down this document. In the absence of this option, - <code>SMTPAppender</code> is assigned a default triggering policy which triggers + <code>SMTPAppender</code> is assigned a default event evaluator which triggers email transmission as a response to any event of level ERROR or higher. </td> @@ -1657,32 +1656,36 @@ By default, the <code>SMTPAppender</code> will initiate the transmission of an email message as a response to an event of level ERROR or higher. However, it is possible to override this default behavior by providing a custom - implementation of the <code>TriggeringPolicy</code> interface. + implementation of the <code>EventEvaluator</code> interface. The <code>SMTPAppender</code> submits each incoming event to its evaluator - by calling <code>isTriggeringEvent()</code> method in order to check whether + by calling <code>evaluate()</code> method in order to check whether the event should trigger an email or just be placed in the cyclic buffer. + When the evaluator gives a positive answer to its evaluation, an email is sent. The <code>SMTPAppender</code> contains one and only one evaluator object. This object may possess its own state. For illustrative purposes, - the <code>CounterBasedTP</code> class listed next, implements a triggering policy whereby - every 1024th event triggers an email message. + the <code>CounterBasedEvaluator</code> class listed next, implements an + event evaluator whereby every 1024th event triggers an email message. -Example 4.9: A <code>TriggeringPolicy</code> implementation -that triggers every 1024th event (<a href="../xref/chapter4/mail/CounterBasedTP.html">logback-examples/src/main/java/chapter4/mail/CounterBasedTP.java</a>) +Example 4.9: A <code>EventEvaluator</code> implementation +that evaluates to <code>true</code> every 1024th event (<a href="../xref/chapter4/mail/CounterBasedEvaluator.html">logback-examples/src/main/java/chapter4/mail/CounterBasedEvaluator.java</a>) <div class="source"><pre>package chapter4.mail; -import java.io.File; -import ch.qos.logback.core.rolling.TriggeringPolicyBase; +import ch.qos.logback.core.boolex.EvaluationException; +import ch.qos.logback.core.boolex.EventEvaluator; +import ch.qos.logback.core.spi.ContextAwareBase; + +public class CounterBasedEvaluator extends ContextAwareBase implements EventEvaluator { -public class CounterBasedTP extends TriggeringPolicyBase { - boolean started; static int LIMIT = 1024; int counter = 0; + String name; - public boolean isTriggeringEvent(File activeFile, Object event) { + public boolean evaluate(Object event) throws NullPointerException, + EvaluationException { counter++; if (counter == LIMIT) { @@ -1692,30 +1695,38 @@ } else { return false; } + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; } }</pre></div> - Note that this implementation extends <code>TriggeringPolicyBase</code> instead - of implementing <code>TriggeringPolicy</code>. This allows the user to concentrate - on the core functions of her <code>TriggeringPolicy</code> and let the base class + Note that this implementation extends <code>ContextAwareBase</code> and + implements <code>EventEvaluator</code>. This allows the user to concentrate + on the core functions of her <code>EventEvaluator</code> and let the base class provide the common functionnality. - Setting the TriggeringPolicy option of - <code>SMTPAppender</code> instructs it to use a custom triggering policy. + Setting the EventEvaluator option of + <code>SMTPAppender</code> instructs it to use a custom evaluator. The next configuration file attaches a <code>SMTPAppender</code> to the root logger. - This appender has a buffer size of 2048 and uses a <code>CounterBasedTP</code> instance - as its triggering policy. + This appender has a buffer size of 2048 and uses a <code>CounterBasedEvaluator</code> instance + as its event evaluator. Example 4.10: <code>SMTPAppender</code> with custom -<code>TriggeringPolicy</code> and buffer size (logback-examples/src/main/java/chapter4/mail/mail3.xml) +<code>Evaluator</code> and buffer size (logback-examples/src/main/java/chapter4/mail/mail3.xml) <div class="source"><pre><configuration> <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> - <TriggeringPolicy class="chapter4.mail.CounterBasedTP" /> + <Evaluator class="chapter4.mail.CounterBasedEvaluator" /> <BufferSize>1050</BufferSize> <SMTPHost>${smtpHost}</SMTPHost> <To>${to}</To>

1 0