November 2006 - logback-dev

[continuum] BUILD SUCCESSFUL: Logback Access Module
by John Noreplai 22 Nov '06

22 Nov '06

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Ok Previous State: Failed Started at: Wed, 22 Nov 2006 21:34:49 +0100 Finished at: Wed, 22 Nov 2006 21:35:01 +0100 Total time: 11s Build Trigger: Forced Exit code: 0 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes ceki minor changes /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 48 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 15 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports 2006-11-22 21:34:59.074::INFO: Logging to STDERR via org.mortbay.log.StdErrLog ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.jetty.JettyBasicTest 2006-11-22 21:34:59.277::INFO: jetty-6.0.x 2006-11-22 21:34:59.336::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 22/11/2006:21:34:59 +0100 localhost 127.0.0.1 22/11/2006:21:34:59 +0100 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.517 sec Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 sec Running ch.qos.logback.access.filter.StatsByDayTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Results : Tests run: 23, Failures: 0, Errors: 0, Skipped: 0 [INFO] [jar:jar] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.6-SNAPSHOT.jar [INFO] [install:install] [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.6-SNAPSHOT.jar to /root/.m2/repository/ch/qos/logback/logback-access/0.6-SNAPSHOT/logback-access-0.6-SNAPSHOT.jar [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 9 seconds [INFO] Finished at: Wed Nov 22 21:35:00 CET 2006 [INFO] Final Memory: 12M/119M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r988 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter
by noreply.ceki＠qos.ch 22 Nov '06

22 Nov '06

Author: ceki Date: Wed Nov 22 21:34:06 2006 New Revision: 988 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java Log: minor changes Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java Wed Nov 22 21:34:06 2006 @@ -1,12 +1,10 @@ package ch.qos.logback.access.filter; import junit.framework.TestCase; -import ch.qos.logback.access.spi.AccessEvent; -import ch.qos.logback.core.util.TimeUtil; public class AccessStatsTest extends TestCase { - AccessEvent accessEvent = new AccessEvent(null, null, null); + public AccessStatsTest(String arg0) { super(arg0); }

1 0

[continuum] BUILD FAILURE: Logback Access Module
by John Noreplai 22 Nov '06

22 Nov '06

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Wed, 22 Nov 2006 20:40:17 +0100 Finished at: Wed, 22 Nov 2006 20:40:26 +0100 Total time: 8s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes ceki Added filter support /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 48 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 15 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.jetty.JettyBasicTest 22/11/2006:20:40:24 +0100 localhost 127.0.0.1 2006-11-22 20:40:24.445::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2006-11-22 20:40:24.517::INFO: jetty-6.0.x 2006-11-22 20:40:24.589::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 1.349 sec <<< FAILURE! Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 sec Running ch.qos.logback.access.filter.StatsByDayTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Results : Tests run: 23, Failures: 0, Errors: 1, Skipped: 0 [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] There are test failures. [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 7 seconds [INFO] Finished at: Wed Nov 22 20:40:25 CET 2006 [INFO] Final Memory: 12M/142M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r987 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty
by noreply.ceki＠qos.ch 22 Nov '06

22 Nov '06

Author: ceki Date: Wed Nov 22 20:31:52 2006 New Revision: 987 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Log: Added filter support 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 22 20:31:52 2006 @@ -13,8 +13,12 @@ import ch.qos.logback.core.Appender; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.CoreGlobal; +import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; +import ch.qos.logback.core.spi.FilterAttachable; +import ch.qos.logback.core.spi.FilterAttachableImpl; +import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.WarnStatus; import ch.qos.logback.core.util.StatusPrinter; @@ -30,65 +34,66 @@ * be added to the jetty configuration file, namely etc/jetty.xml: * * <pre> - * <Ref id="requestLog"> - * <Set name="requestLog"> - * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> - * </Set> - * </Ref> + * <Ref id="requestLog"> + * <Set name="requestLog"> + * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> + * </Set> + * </Ref> * </pre> * * By default, RequestLogImpl looks for a logback configuration file called * logback-access.xml, in the same folder where jetty.xml is located, that is - * etc/logback-access.xml. The logback-access.xml file is slightly different than the usual - * logback classic configuration file. Most of it is the same: Appenders and - * Layouts are declared the exact same way. However, loggers elements are not - * allowed. + * etc/logback-access.xml. The logback-access.xml file is slightly + * different than the usual logback classic configuration file. Most of it is + * the same: Appenders and Layouts are declared the exact same way. However, + * loggers elements are not allowed. * * It is possible to put the logback configuration file anywhere, as long as * it's path is specified. Here is another example, with a path to the * logback-access.xml file. * * <pre> - * <Ref id="requestLog"> - * <Set name="requestLog"> - * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> - * <Set name="fileName">path/to/logback.xml</Set> - * </Set> - * </Ref> + * <Ref id="requestLog"> + * <Set name="requestLog"> + * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> + * <Set name="fileName">path/to/logback.xml</Set> + * </Set> + * </Ref> * </pre> * * * Here is a sample logback-access.xml file that can be used right away: * * <pre> - * <configuration> - * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - * <layout class="ch.qos.logback.access.PatternLayout"> - * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL" /> - * </layout> - * </appender> - * - * <appender-ref ref="STDOUT" /> - * </configuration> + * <configuration> + * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + * <layout class="ch.qos.logback.access.PatternLayout"> + * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL" /> + * </layout> + * </appender> + * + * <appender-ref ref="STDOUT" /> + * </configuration> * </pre> * * * Another configuration file, using SMTPAppender, could be: * * <pre> - * <configuration> - * <appender name="SMTP" class="ch.qos.logback.access.net.SMTPAppender"> - * <layout class="ch.qos.logback.access.PatternLayout"> - * <param name="pattern" value="%remoteIP [%date] %requestURL %statusCode %bytesSent" /> - * </layout> - * <param name="From" value="sender(a)domaine.org" /> - * <param name="SMTPHost" value="mail.domain.org" /> - * <param name="Subject" value="Last Event: %statusCode %requestURL" /> - * <param name="To" value="server_admin(a)domain.org" /> - * </appender> - * <appender-ref ref="SMTP" /> - * </configuration> + * <configuration> + * <appender name="SMTP" class="ch.qos.logback.access.net.SMTPAppender"> + * <layout class="ch.qos.logback.access.PatternLayout"> + * <param name="pattern" value="%remoteIP [%date] %requestURL %statusCode %bytesSent" /> + * </layout> + * <param name="From" value="sender(a)domaine.org" /> + * <param name="SMTPHost" value="mail.domain.org" /> + * <param name="Subject" value="Last Event: %statusCode %requestURL" /> + * <param name="To" value="server_admin(a)domain.org" /> + * </appender> + * <appender-ref ref="SMTP" /> + * </configuration> * </pre> + * * * A special, module-specific implementation of PatternLayout was implemented to * allow http-specific patterns to be used. The @@ -103,26 +108,29 @@ * @author Sébastien Pennec */ public class RequestLogImpl extends ContextBase implements RequestLog, - AppenderAttachable { + AppenderAttachable, FilterAttachable { public final static String DEFAULT_CONFIG_FILE = "etc" + File.separatorChar + "logback-access.xml"; AppenderAttachableImpl aai = new AppenderAttachableImpl(); + FilterAttachableImpl fai = new FilterAttachableImpl(); String filename; public RequestLogImpl() { putObject(CoreGlobal.EVALUATOR_MAP, new HashMap()); } - - + public void log(Request jettyRequest, Response jettyResponse) { JettyServerAdapter adapter = new JettyServerAdapter(jettyRequest, jettyResponse); AccessEvent accessEvent = new AccessEvent(jettyRequest, jettyResponse, adapter); + + if (getFilterChainDecision(accessEvent) == FilterReply.DENY) { + return; + } // TODO better exception handling - //check filter decision see AppenderBase aai.appendLoopOnAppenders(accessEvent); } @@ -211,4 +219,20 @@ public Appender detachAppender(String name) { return aai.detachAppender(name); } + + public void addFilter(Filter newFilter) { + fai.addFilter(newFilter); + } + + public void clearAllFilters() { + fai.clearAllFilters(); + } + + public FilterReply getFilterChainDecision(Object event) { + return fai.getFilterChainDecision(event); + } + + public Filter getFirstFilter() { + return fai.getFirstFilter(); + } }

1 0

svn commit: r986 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/status test/java/ch/qos/logback/core/util
by noreply.seb＠qos.ch 22 Nov '06

22 Nov '06

Author: seb Date: Wed Nov 22 20:05:22 2006 New Revision: 986 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusBase.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/StatusPrinterTest.java Log: Vemoved date from toString() method Verified that exceptions print correctly 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 Wed Nov 22 20:05:22 2006 @@ -110,7 +110,6 @@ */ public String toString() { StringBuffer buf = new StringBuffer(); - buf.append(date + " "); switch (getEffectiveLevel()) { case INFO: buf.append("INFO"); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/StatusPrinterTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/StatusPrinterTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/StatusPrinterTest.java Wed Nov 22 20:05:22 2006 @@ -53,4 +53,28 @@ StatusPrinter.print(context); } + public void testWithException() { + Status s0 = new ErrorStatus("test0", this); + Status s1 = new InfoStatus("test1", this, new Exception("testEx")); + Status s11 = new InfoStatus("test11", this); + Status s12 = new InfoStatus("test12", this); + s1.add(s11); + s1.add(s12); + + Status s2 = new InfoStatus("test2", this); + Status s21 = new InfoStatus("test21", this); + Status s211 = new WarnStatus("test211", this); + + Status s22 = new InfoStatus("test22", this); + s2.add(s21); + s2.add(s22); + s21.add(s211); + + Context context = new ContextBase(); + context.getStatusManager().add(s0); + context.getStatusManager().add(s1); + context.getStatusManager().add(s2); + StatusPrinter.print(context); + } + }

1 0

svn commit: r985 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: . spi
by noreply.seb＠qos.ch 22 Nov '06

22 Nov '06

Author: seb Date: Wed Nov 22 14:29:28 2006 New Revision: 985 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Log: test management 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 22 14:29:28 2006 @@ -27,7 +27,7 @@ suite.addTest(ch.qos.logback.classic.net.PackageTest.suite()); 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()); return suite; } } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java Wed Nov 22 14:29:28 2006 @@ -0,0 +1,24 @@ +/** + * LOGBack: the reliable, fast and flexible logging library for Java. + * + * 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.spi; + + +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(ContextListenerTest.class); + return suite; + } +} \ No newline at end of file

1 0

svn commit: r984 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter
by noreply.ceki＠qos.ch 22 Nov '06

22 Nov '06

Author: ceki Date: Wed Nov 22 13:19:12 2006 New Revision: 984 Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/StatsByDayTest.java Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/PackageTest.java Log: refactored Statistical tests Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java Wed Nov 22 13:19:12 2006 @@ -20,65 +20,7 @@ } public void testBasic() { - - CountingFilter cf = new CountingFilter(); - AccessStatsImpl asi = new AccessStatsImpl(cf); - asi.start(); - // Tue Nov 21 18:05:36 CET 2006 - long now = 1164128736369L; - - // test fresh start - asi.refresh(now); - assertEquals(0, asi.getLastDaysCount()); - assertEquals(0, asi.getDailyAverage(), 0.01); - - // first event - cf.decide(null); - - asi.refresh(now); - assertEquals(0, asi.getLastDaysCount()); - assertEquals(0.0, asi.getDailyAverage(), 0.01); - - long nextDay0 = TimeUtil.computeStartOfNextDay(now); - nextDay0 += 99; - - // there should be one event the next day, avg should also be 1 - asi.refresh(nextDay0); - assertEquals(1.0, asi.getLastDaysCount(), 0.01); - assertEquals(1.0, asi.getDailyAverage(), 0.01); - - cf.decide(null); // 2nd event - cf.decide(null); // 3rd event - - asi.refresh(nextDay0); - assertEquals(1, asi.getLastDaysCount()); - assertEquals(1.0, asi.getDailyAverage(), 0.01); - - long nextDay1 = TimeUtil.computeStartOfNextDay(nextDay0) + 6747; - asi.refresh(nextDay1); - assertEquals(2, asi.getLastDaysCount()); - assertEquals(1.5, asi.getDailyAverage(), 0.01); - - nextDay1 += 4444; - cf.decide(null); // 4th event - cf.decide(null); // 5th event - cf.decide(null); // 6th event - cf.decide(null); // 7th event - - asi.refresh(nextDay1); - // values should remain unchanged - assertEquals(2, asi.getLastDaysCount()); - assertEquals(1.5, asi.getDailyAverage(), 0.01); - - - long nextDay2 = TimeUtil.computeStartOfNextDay(nextDay1) + 11177; - - asi.refresh(nextDay2); - // values should remain unchanged - assertEquals(4, asi.getLastDaysCount()); - assertEquals(7.0/3, asi.getDailyAverage(), 0.01); - - - + //CountingFilter cf = new CountingFilter(); + //AccessStatsImpl asi = new AccessStatsImpl(cf); } } Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/PackageTest.java Wed Nov 22 13:19:12 2006 @@ -16,6 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); + suite.addTestSuite(StatsByDayTest.class); suite.addTestSuite(AccessStatsTest.class); return suite; } Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/StatsByDayTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/StatsByDayTest.java Wed Nov 22 13:19:12 2006 @@ -0,0 +1,73 @@ +package ch.qos.logback.access.filter; + +import ch.qos.logback.core.util.TimeUtil; +import junit.framework.TestCase; + +public class StatsByDayTest extends TestCase { + + public StatsByDayTest(String name) { + super(name); + } + + protected void setUp() throws Exception { + super.setUp(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testBasic() { + // Tue Nov 21 18:05:36 CET 2006 + long now = 1164128736369L; + StatsByDay statsByDay = new StatsByDay(now); + + int total = 0; + // test fresh start + statsByDay.update(now, 0); + assertEquals(0, statsByDay.getLastCount()); + assertEquals(0, statsByDay.getAverage(), 0.01); + + + total++; + statsByDay.update(now, total); + assertEquals(0, statsByDay.getLastCount()); + assertEquals(0.0, statsByDay.getAverage(), 0.01); + + long nextDay0 = TimeUtil.computeStartOfNextDay(now); + nextDay0 += 99; + + // there should be one event the next day, avg should also be 1 + statsByDay.update(nextDay0, total); + assertEquals(1.0, statsByDay.getLastCount(), 0.01); + assertEquals(1.0, statsByDay.getAverage(), 0.01); + + total += 2; + + statsByDay.update(nextDay0, total); + assertEquals(1, statsByDay.getLastCount()); + assertEquals(1.0, statsByDay.getAverage(), 0.01); + + long nextDay1 = TimeUtil.computeStartOfNextDay(nextDay0) + 6747; + statsByDay.update(nextDay1, total); + assertEquals(2, statsByDay.getLastCount()); + assertEquals(1.5, statsByDay.getAverage(), 0.01); + + nextDay1 += 4444; + total += 4; + + statsByDay.update(nextDay1, total); + // values should remain unchanged + assertEquals(2, statsByDay.getLastCount()); + assertEquals(1.5, statsByDay.getAverage(), 0.01); + + + long nextDay2 = TimeUtil.computeStartOfNextDay(nextDay1) + 11177; + + statsByDay.update(nextDay2, total); + // values should remain unchanged + assertEquals(4, statsByDay.getLastCount()); + assertEquals(7.0/3, statsByDay.getAverage(), 0.01); + } + +}

1 0

svn commit: r983 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter
by noreply.ceki＠qos.ch 22 Nov '06

22 Nov '06

Author: ceki Date: Wed Nov 22 13:07:51 2006 New Revision: 983 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMonth.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByWeek.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/PeriodicStats.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByDay.java Log: ongoing work Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java Wed Nov 22 13:07:51 2006 @@ -9,10 +9,10 @@ double getDailyAverage(); - long getWeeklyTotal(); - long getWeeklyAverage(); + long getLastWeeksCount(); + double getWeeklyAverage(); - long getMonthlyTotal(); - long getMonthlyAverage(); + long getLastMonthsCount(); + double getMonthlyAverage(); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java Wed Nov 22 13:07:51 2006 @@ -7,7 +7,9 @@ final CountingFilter countingFilter; boolean started; - StatsByDay statsByDay = new StatsByDay(System.currentTimeMillis()); + StatsByDay statsByDay = new StatsByDay(); + StatsByWeek statsByWeek = new StatsByWeek(); + StatsByMonth statsByMonth = new StatsByMonth(); AccessStatsImpl(CountingFilter countingFilter) { this.countingFilter = countingFilter; @@ -21,28 +23,32 @@ return statsByDay.getLastCount(); } - public long getMonthlyAverage() { - return 0; + public double getMonthlyAverage() { + return statsByMonth.getAverage(); } - public long getMonthlyTotal() { - return 0; + public long getLastMonthsCount() { + return statsByMonth.getLastCount(); } public long getTotal() { return countingFilter.getTotal(); } - public long getWeeklyAverage() { - return 0; + public double getWeeklyAverage() { + return statsByWeek.getAverage(); } - public long getWeeklyTotal() { - return 0; + public long getLastWeeksCount() { + return statsByWeek.getLastCount(); } void refresh(long now) { - statsByDay.refresh(now, getTotal()); + long total = getTotal(); + statsByDay.update(now, total); + statsByWeek.update(now, total); + statsByMonth.update(now, total); + } void refresh() { @@ -52,7 +58,10 @@ public void start() { started = true; - + long now = System.currentTimeMillis(); + statsByDay = new StatsByDay(now); + statsByWeek = new StatsByWeek(now); + statsByMonth = new StatsByMonth(now); } public boolean isStarted() { @@ -61,6 +70,9 @@ public void stop() { started = false; + statsByDay.reset(); + statsByWeek.reset(); + statsByMonth.reset(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/PeriodicStats.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/PeriodicStats.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/PeriodicStats.java Wed Nov 22 13:07:51 2006 @@ -10,11 +10,15 @@ private double average; private int n; + PeriodicStats() { + this(System.currentTimeMillis()); + } + PeriodicStats(long now) { nextPeriodBegins = computeStartOfNextPeriod(now); } - void refresh(long now, long total) { + void update(long now, long total) { if (now > nextPeriodBegins) { lastCount = total - lastTotal; lastTotal = total; @@ -31,6 +35,18 @@ return lastCount; } + void reset(long now) { + nextPeriodBegins = computeStartOfNextPeriod(now); + lastTotal = 0; + lastCount = 0; + average = 0.0; + n = 0; + } + + void reset() { + reset(System.currentTimeMillis()); + } + abstract long computeStartOfNextPeriod(long now); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByDay.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByDay.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByDay.java Wed Nov 22 13:07:51 2006 @@ -3,13 +3,18 @@ import ch.qos.logback.core.util.TimeUtil; public class StatsByDay extends PeriodicStats { - + + StatsByDay() { + super(); + } + StatsByDay(long now) { super(now); } + @Override long computeStartOfNextPeriod(long now) { return TimeUtil.computeStartOfNextDay(now); } - + } Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMonth.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMonth.java Wed Nov 22 13:07:51 2006 @@ -0,0 +1,20 @@ +package ch.qos.logback.access.filter; + +import ch.qos.logback.core.util.TimeUtil; + +public class StatsByMonth extends PeriodicStats { + + StatsByMonth() { + super(); + } + + StatsByMonth(long now) { + super(now); + } + + @Override + long computeStartOfNextPeriod(long now) { + return TimeUtil.computeStartOfNextMonth(now); + } + +} Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByWeek.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByWeek.java Wed Nov 22 13:07:51 2006 @@ -0,0 +1,19 @@ +package ch.qos.logback.access.filter; + +import ch.qos.logback.core.util.TimeUtil; + +public class StatsByWeek extends PeriodicStats { + + StatsByWeek() { + super(); + } + + StatsByWeek(long now) { + super(now); + } + @Override + long computeStartOfNextPeriod(long now) { + return TimeUtil.computeStartOfNextWeek(now); + } + +}

1 0

svn commit: r982 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html
by noreply.seb＠qos.ch 22 Nov '06

22 Nov '06

Author: seb Date: Wed Nov 22 12:03:49 2006 New Revision: 982 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java Log: minor fix Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java Wed Nov 22 12:03:49 2006 @@ -63,6 +63,7 @@ assertNotNull(rootElement.element("body")); } + @SuppressWarnings("unchecked") public void testPresentationHeader() { String header = layout.getFileHeader(); String presentationHeader = layout.getPresentationHeader();

1 0

svn commit: r981 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html
by noreply.seb＠qos.ch 22 Nov '06

22 Nov '06

Author: seb Date: Wed Nov 22 11:59:00 2006 New Revision: 981 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java Log: minor fix Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java Wed Nov 22 11:59:00 2006 @@ -150,7 +150,7 @@ public String getPresentationHeader() { StringBuffer sbuf = new StringBuffer(); - sbuf.append("<hr size=\"1\" noshade=\"true\" width=\"75%\" align=\"left\" />"); + sbuf.append("<hr size=\"1\" noshade=\"true\" width=\"50%\" align=\"left\" />"); sbuf.append(LINE_SEP); sbuf.append("Log session start time "); sbuf.append(new java.util.Date());

1 0