November 2006 - logback-dev

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

24 Nov '06

Author: seb Date: Fri Nov 24 14:07:14 2006 New Revision: 998 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/util/StatusPrinter.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/StatusPrinterTest.java Log: Removed static system.out access from StatusBase Better StatusPrinterTest 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 Fri Nov 24 14:07:14 2006 @@ -15,9 +15,6 @@ abstract public class StatusBase implements Status { - static { - System.out.println("XXXXXXXXXXXX Loading StatusBase "); - } static private final List<Status> EMPTY_LIST = new ArrayList<Status>(0); int level; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Fri Nov 24 14:07:14 2006 @@ -10,6 +10,7 @@ package ch.qos.logback.core.util; +import java.io.PrintStream; import java.util.Iterator; import ch.qos.logback.core.Context; @@ -17,7 +18,13 @@ import ch.qos.logback.core.status.StatusManager; public class StatusPrinter { + + private static PrintStream ps = System.out; + public static void setPrintStream(PrintStream printStream) { + ps = printStream; + } + public static void print(Context context) { if (context == null) { throw new IllegalArgumentException("Context argument cannot be null"); @@ -25,7 +32,7 @@ StatusManager sm = context.getStatusManager(); if (sm == null) { - System.out.println("WARN: Context named \"" + context.getName() + ps.println("WARN: Context named \"" + context.getName() + "\" has no status manager"); } @@ -49,9 +56,9 @@ } else { prefix = indentation + "|-"; } - System.out.println(prefix+s); + ps.println(prefix+s); if (s.getThrowable() != null) { - s.getThrowable().printStackTrace(System.out); + s.getThrowable().printStackTrace(ps); } if(s.hasChildren()) { Iterator<Status> ite = s.iterator(); 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 Fri Nov 24 14:07:14 2006 @@ -1,5 +1,8 @@ package ch.qos.logback.core.util; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + import junit.framework.TestCase; import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; @@ -10,15 +13,24 @@ public class StatusPrinterTest extends TestCase { + ByteArrayOutputStream outputStream; + PrintStream ps; + public StatusPrinterTest(String arg0) { super(arg0); } protected void setUp() throws Exception { + outputStream = new ByteArrayOutputStream(); + ps = new PrintStream(outputStream); + StatusPrinter.setPrintStream(ps); super.setUp(); } protected void tearDown() throws Exception { + StatusPrinter.setPrintStream(System.out); + ps = null; + outputStream = null; super.tearDown(); } @@ -26,6 +38,8 @@ Context context = new ContextBase(); context.getStatusManager().add(new InfoStatus("test", this)); StatusPrinter.print(context); + String result = outputStream.toString(); + assertTrue(result.contains("|-INFO in testBasic")); } public void testNested() { @@ -50,7 +64,12 @@ context.getStatusManager().add(s0); context.getStatusManager().add(s1); context.getStatusManager().add(s2); + StatusPrinter.print(context); + String result = outputStream.toString(); + assertTrue(result.contains("+ INFO in testNested")); + assertTrue(result.contains("+ WARN in testNested")); + assertTrue(result.contains(" |-WARN in testNested")); } public void testWithException() { @@ -74,7 +93,12 @@ context.getStatusManager().add(s0); context.getStatusManager().add(s1); context.getStatusManager().add(s2); - StatusPrinter.print(context); + StatusPrinter.print(context); + String result = outputStream.toString(); + System.out.println(result); + assertTrue(result.contains("|-ERROR in testWithException")); + assertTrue(result.contains("+ INFO in testWithException")); + assertTrue(result.contains("ch.qos.logback.core.util.StatusPrinterTest.testWithException")); } }

1 0

svn commit: r997 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/jetty logback-core/src/main/java/ch/qos/logback/core/util
by noreply.seb＠qos.ch 24 Nov '06

24 Nov '06

Author: seb Date: Fri Nov 24 11:00:58 2006 New Revision: 997 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogMapper.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java Log: RequestLog objects now register themselves to the RequestLogMapper to be accessible later on Added a trick in OptionHelper to load classes 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 Fri Nov 24 11:00:58 2006 @@ -20,6 +20,7 @@ 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.InfoStatus; import ch.qos.logback.core.status.WarnStatus; import ch.qos.logback.core.util.StatusPrinter; @@ -154,16 +155,20 @@ getStatusManager().add( new ErrorStatus("[" + filename + "] does not exist", this)); } - + + if (getName() == null) { + setName("LogbackRequestLog"); + } + RequestLogMapper.addRequestLog(this); + getStatusManager().add( + new InfoStatus("RequestLog added to RequestLogMapper with name: " + getName(), this)); } public void stop() throws Exception { - // System.out.println("RequestLogImpl-stop called"); aai.detachAndStopAllAppenders(); } public boolean isRunning() { - // System.out.println("RequestLogImpl-isRunning called"); return false; } @@ -172,22 +177,18 @@ } public boolean isStarted() { - // System.out.println("RequestLogImpl-isStarted called"); return true; } public boolean isStarting() { - // System.out.println("RequestLogImpl-isStarting called"); return false; } public boolean isStopping() { - // System.out.println("RequestLogImpl-isStopping called"); return false; } public boolean isFailed() { - // System.out.println("RequestLogImpl-isFailed called"); return false; } Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogMapper.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogMapper.java Fri Nov 24 11:00:58 2006 @@ -0,0 +1,18 @@ +package ch.qos.logback.access.jetty; + +import java.util.HashMap; +import java.util.Map; + +public class RequestLogMapper { + + private static Map<String, RequestLogImpl> requestLogMap = new HashMap<String, RequestLogImpl>(); + + public static void addRequestLog(RequestLogImpl requestLogImpl) { + requestLogMap.put(requestLogImpl.getName(), requestLogImpl); + } + + public static RequestLogImpl get(String key) { + return requestLogMap.get(key); + } + +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java Fri Nov 24 11:00:58 2006 @@ -26,8 +26,16 @@ if (className == null) { throw new NullPointerException(); } - Class classObj = Class.forName(className); - + + // FIXME This is temporary (really!). + Class classObj = null; + try { + classObj = Class.forName(className); + } catch(ClassNotFoundException e) { + ClassLoader cccl = Thread.currentThread().getContextClassLoader(); + classObj = cccl.loadClass(className); + } + if (!superClass.isAssignableFrom(classObj)) { throw new IncompatibleClassException(superClass, classObj); }

1 0

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

23 Nov '06

Author: ceki Date: Thu Nov 23 16:18:26 2006 New Revision: 996 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusBase.java Log: testing class loading 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 Thu Nov 23 16:18:26 2006 @@ -15,6 +15,9 @@ abstract public class StatusBase implements Status { + static { + System.out.println("XXXXXXXXXXXX Loading StatusBase "); + } static private final List<Status> EMPTY_LIST = new ArrayList<Status>(0); int level;

1 0

svn commit: r995 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/util test/java/ch/qos/logback/core/util
by noreply.ceki＠qos.ch 23 Nov '06

23 Nov '06

Author: ceki Date: Thu Nov 23 16:10:05 2006 New Revision: 995 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java Log: - accept 'seconde' as a valid way of specifying seconds - test parsing of durations where the init is specified in upper case Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java Thu Nov 23 16:10:05 2006 @@ -30,7 +30,7 @@ private final static String DOUBLE_PART = "([0-9]*(.[0-9]+)?)"; private final static int DOUBLE_GROUP = 1; - private final static String UNIT_PART = "(|millisecond|second|minute|hour|day)s?"; + private final static String UNIT_PART = "(|millisecond|second(e)?|minute|hour|day)s?"; private final static int UNIT_GROUP = 3; private static final Pattern DURATION_PATTERN = Pattern.compile(DOUBLE_PART @@ -85,7 +85,7 @@ double doubleValue = Double.valueOf(doubleStr); if (unitStr.equalsIgnoreCase("millisecond") || unitStr.length() == 0) { return buildByMilliseconds(doubleValue); - } else if (unitStr.equalsIgnoreCase("second")) { + } else if (unitStr.equalsIgnoreCase("second") || unitStr.equalsIgnoreCase("seconde")) { return buildBySeconds(doubleValue); } else if (unitStr.equalsIgnoreCase("minute")) { return buildByMinutes(doubleValue); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java Thu Nov 23 16:10:05 2006 @@ -46,9 +46,24 @@ } { - Duration d = Duration.valueOf("10 seconds"); + Duration d = Duration.valueOf("10 SECOnds"); assertEquals(10 * 1000, d.getMilliseconds()); } + + { + Duration d = Duration.valueOf("12seconde"); + assertEquals(12 * 1000, d.getMilliseconds()); + } + + { + Duration d = Duration.valueOf("14 SECONDES"); + assertEquals(14 * 1000, d.getMilliseconds()); + } + + { + Duration d = Duration.valueOf("12second"); + assertEquals(12 * 1000, d.getMilliseconds()); + } { Duration d = Duration.valueOf("10.7 seconds");

1 0

svn commit: r994 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 23 Nov '06

23 Nov '06

Author: ceki Date: Thu Nov 23 13:23:00 2006 New Revision: 994 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java Log: When removing keys from the MDC, the new value should be stored as a Threadlocal. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/MDC.java Thu Nov 23 13:23:00 2006 @@ -44,8 +44,8 @@ if (oldMap != null) { newMap.putAll(oldMap); } + // the newMap replaces the old one for serialisation's sake threadLocal.set(newMap); - newMap.put(key, val); } @@ -81,7 +81,8 @@ if (oldMap != null) { newMap.putAll(oldMap); } - + // the newMap replaces the old one for serialisation's sake + threadLocal.set(newMap); newMap.remove(key); }

1 0

svn commit: r993 - 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 23:17:37 2006 New Revision: 993 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatisticalViewImpl.java Log: minor changes Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java Wed Nov 22 23:17:37 2006 @@ -14,6 +14,8 @@ long total = 0; final StatisticalViewImpl accessStatsImpl; + String domain = "ch.qos.logback.access"; + public CountingFilter() { accessStatsImpl = new StatisticalViewImpl(this); } @@ -21,6 +23,7 @@ @Override public FilterReply decide(Object event) { total++; + accessStatsImpl.update(); return FilterReply.NEUTRAL; } @@ -33,7 +36,7 @@ public void start() { MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); try { - ObjectName on = new ObjectName("totp:Filter=1"); + ObjectName on = new ObjectName(domain+":Name="+getName()); StandardMBean mbean = new StandardMBean(accessStatsImpl, StatisticalView.class); mbs.registerMBean(mbean, on); super.start(); @@ -53,5 +56,13 @@ addError("Failed to unregister mbean", e); } } + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatisticalViewImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatisticalViewImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatisticalViewImpl.java Wed Nov 22 23:17:37 2006 @@ -45,7 +45,7 @@ return statsByWeek.getLastCount(); } - void refresh(long now) { + void update(long now) { long total = getTotal(); statsByMinute.update(now, total); statsByHour.update(now, total); @@ -55,12 +55,13 @@ } - void refresh() { + void update() { long now = System.currentTimeMillis(); - refresh(now); + update(now); } public void start() { + System.out.println("StatisticalViewImpl start called"); started = true; long now = System.currentTimeMillis(); statsByMinute = new StatsByMinute(now);

1 0

svn commit: r992 - 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 23:00:42 2006 New Revision: 992 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMinute.java Log: minute count should count minutes not days Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMinute.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMinute.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMinute.java Wed Nov 22 23:00:42 2006 @@ -14,7 +14,7 @@ @Override long computeStartOfNextPeriod(long now) { - return TimeUtil.computeStartOfNextDay(now); + return TimeUtil.computeStartOfNextMinute(now); } }

1 0

svn commit: r991 - 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 22:30:09 2006 New Revision: 991 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java Log: make constructor public Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java Wed Nov 22 22:30:09 2006 @@ -14,7 +14,7 @@ long total = 0; final StatisticalViewImpl accessStatsImpl; - CountingFilter() { + public CountingFilter() { accessStatsImpl = new StatisticalViewImpl(this); }

1 0

svn commit: r990 - 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 21:57:37 2006 New Revision: 990 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatisticalView.java - copied, changed from r987, /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/StatisticalViewImpl.java - copied, changed from r987, /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/StatsByHour.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMinute.java Removed: 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 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java Log: Adding stats by minute and by hour Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java Wed Nov 22 21:57:37 2006 @@ -12,10 +12,10 @@ public class CountingFilter extends Filter { long total = 0; - final AccessStatsImpl accessStatsImpl; + final StatisticalViewImpl accessStatsImpl; CountingFilter() { - accessStatsImpl = new AccessStatsImpl(this); + accessStatsImpl = new StatisticalViewImpl(this); } @Override @@ -34,7 +34,7 @@ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); try { ObjectName on = new ObjectName("totp:Filter=1"); - StandardMBean mbean = new StandardMBean(accessStatsImpl, AccessStats.class); + StandardMBean mbean = new StandardMBean(accessStatsImpl, StatisticalView.class); mbs.registerMBean(mbean, on); super.start(); } catch (Exception e) { Copied: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatisticalView.java (from r987, /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/StatisticalView.java Wed Nov 22 21:57:37 2006 @@ -1,10 +1,18 @@ package ch.qos.logback.access.filter; -public interface AccessStats { +public interface StatisticalView { long getTotal(); + long getLastMinuteCount(); + double getMinuteAverage(); + + + long getLastHoursCount(); + double getHourlyAverage(); + + long getLastDaysCount(); double getDailyAverage(); Copied: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatisticalViewImpl.java (from r987, /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/StatisticalViewImpl.java Wed Nov 22 21:57:37 2006 @@ -2,16 +2,18 @@ import ch.qos.logback.core.spi.LifeCycle; -public class AccessStatsImpl implements AccessStats, LifeCycle { +public class StatisticalViewImpl implements StatisticalView, LifeCycle { final CountingFilter countingFilter; boolean started; + StatsByMinute statsByMinute = new StatsByMinute(); + StatsByHour statsByHour = new StatsByHour(); StatsByDay statsByDay = new StatsByDay(); StatsByWeek statsByWeek = new StatsByWeek(); StatsByMonth statsByMonth = new StatsByMonth(); - AccessStatsImpl(CountingFilter countingFilter) { + StatisticalViewImpl(CountingFilter countingFilter) { this.countingFilter = countingFilter; } @@ -45,6 +47,8 @@ void refresh(long now) { long total = getTotal(); + statsByMinute.update(now, total); + statsByHour.update(now, total); statsByDay.update(now, total); statsByWeek.update(now, total); statsByMonth.update(now, total); @@ -59,6 +63,8 @@ public void start() { started = true; long now = System.currentTimeMillis(); + statsByMinute = new StatsByMinute(now); + statsByHour = new StatsByHour(now); statsByDay = new StatsByDay(now); statsByWeek = new StatsByWeek(now); statsByMonth = new StatsByMonth(now); @@ -70,9 +76,27 @@ public void stop() { started = false; + statsByMinute.reset(); + statsByHour.reset(); statsByDay.reset(); statsByWeek.reset(); statsByMonth.reset(); } + public long getLastMinuteCount() { + return statsByMinute.getLastCount(); + } + + public double getMinuteAverage() { + return statsByMinute.getAverage(); + } + + public double getHourlyAverage() { + return statsByHour.getAverage(); + } + + public long getLastHoursCount() { + return statsByHour.getLastCount(); + } + } Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByHour.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByHour.java Wed Nov 22 21:57:37 2006 @@ -0,0 +1,20 @@ +package ch.qos.logback.access.filter; + +import ch.qos.logback.core.util.TimeUtil; + +public class StatsByHour extends PeriodicStats { + + StatsByHour() { + super(); + } + + StatsByHour(long now) { + super(now); + } + + @Override + long computeStartOfNextPeriod(long now) { + return TimeUtil.computeStartOfNextHour(now); + } + +} Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMinute.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByMinute.java Wed Nov 22 21:57:37 2006 @@ -0,0 +1,20 @@ +package ch.qos.logback.access.filter; + +import ch.qos.logback.core.util.TimeUtil; + +public class StatsByMinute extends PeriodicStats { + + StatsByMinute() { + super(); + } + + StatsByMinute(long now) { + super(now); + } + + @Override + long computeStartOfNextPeriod(long now) { + return TimeUtil.computeStartOfNextDay(now); + } + +}

1 0

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

22 Nov '06

Author: ceki Date: Wed Nov 22 21:54:13 2006 New Revision: 989 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Log: added support by minute and by hour computations Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java Wed Nov 22 21:54:13 2006 @@ -13,6 +13,25 @@ cal.add(Calendar.SECOND, 1); return cal.getTime().getTime(); } + + public static long computeStartOfNextMinute(long now) { + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date(now)); + cal.set(Calendar.MILLISECOND, 0); + cal.set(Calendar.SECOND, 0); + cal.add(Calendar.MINUTE, 1); + return cal.getTime().getTime(); + } + + public static long computeStartOfNextHour(long now) { + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date(now)); + cal.set(Calendar.MILLISECOND, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MINUTE, 0); + cal.add(Calendar.HOUR, 1); + return cal.getTime().getTime(); + } public static long computeStartOfNextDay(long now) { Calendar cal = Calendar.getInstance(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Wed Nov 22 21:54:13 2006 @@ -22,13 +22,34 @@ public void testSecond() { // Mon Nov 20 18:05:17,522 CET 2006 long now = 1164042317522L; - // Mon Nov 20 18:06:00,000 CET 2006 + //Mon Nov 20 18:05:18,000 CET 2006 long expected = 1164042318000L; long computed = TimeUtil.computeStartOfNextSecond(now); assertEquals(expected - now, 478); assertEquals(expected, computed); } + public void testMinute() { + // Mon Nov 20 18:05:17,522 CET 2006 + long now = 1164042317522L; + // Mon Nov 20 18:06:00 CET 2006 + long expected = 1164042360000L; + long computed = TimeUtil.computeStartOfNextMinute(now); + assertEquals(expected - now, 1000*42+478); + assertEquals(expected, computed); + } + + public void testHour() { + // Mon Nov 20 18:05:17,522 CET 2006 + long now = 1164042317522L; + // Mon Nov 20 19:00:00 CET 2006 + long expected = 1164045600000L; + System.out.println(new Date(expected)); + long computed = TimeUtil.computeStartOfNextHour(now); + assertEquals(expected - now, 1000*(42+60*54)+478); + assertEquals(expected, computed); + } + public void testDay() { // Mon Nov 20 18:05:17 CET 2006 long now = 1164042317522L;

1 0