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

svn commit: r840 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:49:22 2006 New Revision: 840 Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/dummy Log: bogus file removed

1 0

svn commit: r839 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:49:05 2006 New Revision: 839 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/dummy Log: Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/dummy ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/dummy Tue Oct 31 22:49:05 2006 @@ -0,0 +1 @@ +ff \ No newline at end of file

1 0

svn commit: r838 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: . filter
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:47:56 2006 New Revision: 838 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPTurboFilter.java - copied, changed from r837, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPClassicFilter.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPClassicFilter.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Log: renamed ClassicFilter as TurboFilter Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Tue Oct 31 22:47:56 2006 @@ -13,7 +13,7 @@ import java.net.InetAddress; import junit.framework.TestCase; -import ch.qos.logback.classic.turbo.NOPClassicFilter; +import ch.qos.logback.classic.turbo.NOPTurboFilter; import ch.qos.logback.core.appender.NOPAppender; public class LoggerPerfTest extends TestCase { @@ -67,7 +67,7 @@ double loopNopFilter(long len) { LoggerContext lc = new LoggerContext(); NOPAppender mopAppender = new NOPAppender(); - NOPClassicFilter nopFilter = new NOPClassicFilter(); + NOPTurboFilter nopFilter = new NOPTurboFilter(); nopFilter.setName("nop"); mopAppender.start(); lc.addFilter(nopFilter); Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPTurboFilter.java (from r837, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPClassicFilter.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPClassicFilter.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPTurboFilter.java Tue Oct 31 22:47:56 2006 @@ -4,10 +4,10 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.turbo.ClassicFilter; +import ch.qos.logback.classic.turbo.TurboFilter; import ch.qos.logback.core.filter.Filter; -public class NOPClassicFilter extends ClassicFilter { +public class NOPTurboFilter extends TurboFilter { @Override public int decide(final Marker marker, final Logger logger, final Level level, final String format,

1 0

svn commit: r837 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:43:12 2006 New Revision: 837 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPClassicFilter.java Log: ongoing work Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPClassicFilter.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/NOPClassicFilter.java Tue Oct 31 22:43:12 2006 @@ -0,0 +1,19 @@ +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.turbo.ClassicFilter; +import ch.qos.logback.core.filter.Filter; + +public class NOPClassicFilter extends ClassicFilter { + + @Override + public int decide(final Marker marker, final Logger logger, final Level level, final String format, + final Object[] params, final Throwable t) { + + return Filter.NEUTRAL; + } + +}

1 0

svn commit: r836 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:43:11 2006 New Revision: 836 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/filter/ Log: ongoing work

1 0

svn commit: r835 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:42:26 2006 New Revision: 835 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/BasicLoggerTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Log: minor Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/BasicLoggerTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/BasicLoggerTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/BasicLoggerTest.java Tue Oct 31 22:42:26 2006 @@ -1,11 +1,11 @@ /** - * Logback: the reliable, generic, fast and flexible logging framework. - * + * 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.classic; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Tue Oct 31 22:42:26 2006 @@ -1,9 +1,19 @@ +/** + * 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; import java.net.InetAddress; import junit.framework.TestCase; +import ch.qos.logback.classic.turbo.NOPClassicFilter; import ch.qos.logback.core.appender.NOPAppender; public class LoggerPerfTest extends TestCase { @@ -16,8 +26,8 @@ } public void testSpeed() { long len = 1000*1000*10; - loop(len); - double avg = loop(len); + loopBasic(len); + double avg = loopBasic(len); System.out.println("Running on "+localhostName); // check for performance on KAL only @@ -27,10 +37,40 @@ System.out.println("Average log time for disabled statements: "+avg+" nanos."); } - double loop(long len) { + public void testNOPFilterSpeed() { + long len = 1000*1000*10; + loopNopFilter(len); + double avg = loopNopFilter(len); + + System.out.println("Running on "+localhostName); + // check for performance on KAL only + if(KAL.equals(localhostName)) { + assertTrue(62 > avg); + } + System.out.println("Average log time for disabled statements: "+avg+" nanos."); + } + + double loopBasic(long len) { + LoggerContext lc = new LoggerContext(); + NOPAppender mopAppender = new NOPAppender(); + mopAppender.start(); + Logger logger = lc.getLogger(this.getClass()); + logger.setLevel(Level.OFF); + long start = System.nanoTime(); + for(long i = 0; i < len; i++) { + logger.debug("Toto"); + } + long end = System.nanoTime(); + return (end-start)/len; + } + + double loopNopFilter(long len) { LoggerContext lc = new LoggerContext(); NOPAppender mopAppender = new NOPAppender(); + NOPClassicFilter nopFilter = new NOPClassicFilter(); + nopFilter.setName("nop"); mopAppender.start(); + lc.addFilter(nopFilter); Logger logger = lc.getLogger(this.getClass()); logger.setLevel(Level.OFF); long start = System.nanoTime();

1 0

svn commit: r834 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:41:53 2006 New Revision: 834 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java Log: minor changes Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java Tue Oct 31 22:41:53 2006 @@ -5,7 +5,7 @@ * This abstract class is meant to be a base for specific evaluator filters. * </p> * <p> - * The value of the {@link #on_match} and {@link #onMismatch} attributes is set to + * The value of the {@link #onMatch} and {@link #onMismatch} attributes is set to * {@link Filter.NEUTRAL}, so that a badly configured evaluator filter doesn't * disturb the functionning of the chain. * </p> @@ -21,16 +21,16 @@ public abstract class AbstractEvalutatorFilter extends Filter { - protected int on_match = NEUTRAL; + protected int onMatch = NEUTRAL; protected int onMismatch = NEUTRAL; final public void setOnMatch(String action) { if ("NEUTRAL".equals(action)) { - on_match = NEUTRAL; + onMatch = NEUTRAL; } else if ("ACCEPT".equals(action)) { - on_match = ACCEPT; + onMatch = ACCEPT; } else if ("DENY".equals(action)) { - on_match = DENY; + onMatch = DENY; } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java Tue Oct 31 22:41:53 2006 @@ -7,6 +7,7 @@ EventEvaluator evaluator; + @Override public void start() { if(evaluator != null) { super.start(); @@ -32,7 +33,7 @@ } try { if (evaluator.evaluate(event)) { - return on_match; + return onMatch; } else { return onMismatch; } @@ -40,7 +41,6 @@ addError("Evaluator "+evaluator.getName()+" threw an exception", e); return NEUTRAL; } - } }

1 0

svn commit: r833 - in logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic: . spi
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:40:03 2006 New Revision: 833 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachable.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachableImpl.java Log: ongoing work Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Tue Oct 31 22:40:03 2006 @@ -16,7 +16,7 @@ import org.slf4j.ILoggerFactory; import org.slf4j.Marker; -import ch.qos.logback.classic.filter.ClassicFilter; +import ch.qos.logback.classic.turbo.ClassicFilter; import ch.qos.logback.classic.spi.ClassicFilterAttachable; import ch.qos.logback.classic.spi.ClassicFilterAttachableImpl; import ch.qos.logback.classic.spi.LoggerContextRemoteView; Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachable.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachable.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachable.java Tue Oct 31 22:40:03 2006 @@ -4,7 +4,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.filter.ClassicFilter; +import ch.qos.logback.classic.turbo.ClassicFilter; /** * Interface for attaching ClassicFilter instances to objects. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachableImpl.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachableImpl.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ClassicFilterAttachableImpl.java Tue Oct 31 22:40:03 2006 @@ -13,7 +13,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.filter.ClassicFilter; +import ch.qos.logback.classic.turbo.ClassicFilter; import ch.qos.logback.core.filter.Filter; /** @@ -66,8 +66,8 @@ * ACCEPT or DENY, then that value is returned. If all of the filters return * NEUTRAL, then NEUTRAL is returned. */ - public int getFilterChainDecision(Marker marker, Logger logger, - Level level, String format, Object[] params, Throwable t) { + public final int getFilterChainDecision(final Marker marker, final Logger logger, + final Level level, final String format, final Object[] params, final Throwable t) { ClassicFilter f = headFilter; while (f != null) {

1 0

svn commit: r832 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:38:26 2006 New Revision: 832 Removed: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/filter/ Log: Changed package name c.q.l.classic.filter to c.q.l.classic.turbo

1 0

svn commit: r831 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 31 Oct '06

31 Oct '06

Author: ceki Date: Tue Oct 31 22:37:45 2006 New Revision: 831 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ClassicFilter.java Log: ongoing work Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ClassicFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ClassicFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ClassicFilter.java Tue Oct 31 22:37:45 2006 @@ -1,4 +1,4 @@ -package ch.qos.logback.classic.filter; +package ch.qos.logback.classic.turbo; import org.slf4j.Marker;

1 0