July 2009 - logback-dev - mailman3.qos.ch

svn commit: r2335 - in logback/trunk/logback-site/src/site/pages: . manual
by noreply.ceki＠qos.ch 10 Jul '09

10 Jul '09

Author: ceki Date: Fri Jul 10 11:20:11 2009 New Revision: 2335 Modified: logback/trunk/logback-site/src/site/pages/manual/filters.html logback/trunk/logback-site/src/site/pages/manual/index.html logback/trunk/logback-site/src/site/pages/news.html Log: - fixed link to JMX Configurator chapter in the manual index.html - rewording in filters.html (as described in LBSITE-31 Modified: logback/trunk/logback-site/src/site/pages/manual/filters.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/filters.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/filters.html Fri Jul 10 11:20:11 2009 @@ -182,8 +182,8 @@ At the moment, there are two filters that ship with logback. <a href="../xref/ch/qos/logback/classic/LevelFilter.html"> <code>LevelFilter</code></a> provides event filtering based on a - <code>Level</code> value. It the event's level is equal to the - configured level, the filter accepts of denies the event, + <code>Level</code> value. If the event's level is equal to the + configured level, the filter accepts or denies the event, depending on its configuration. It allows you to choose the behaviour of logback for a precise given level. Here is a sample configuration that uses <code>LevelFilter</code>. Modified: logback/trunk/logback-site/src/site/pages/manual/index.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/index.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/index.html Fri Jul 10 11:20:11 2009 @@ -102,7 +102,7 @@ </li> <li> - <a href="jmxConfigurator.html">Chapter 9: JMX Configurator</a> + <a href="jmxConfig.html">Chapter 9: JMX Configurator</a> </li> <li> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Fri Jul 10 11:20:11 2009 @@ -92,7 +92,14 @@ now behave correctly when invoked via <code>Logger.isXXXEnabled</code> methods. - + + Fixed <a + href="http://jira.qos.ch/browse/LBCORE-107">LBCORE-107</a>, + incorrectly set context information for the + <code>NestedBasicPropertyIA</code> instance in Joran, reported by + Lóránt Pintér. + + <hr width="80%" align="center" /> <h3>12th of February 2009 - Release of version 0.9.15</h3>

1 0

svn commit: r2334 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/joran test/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 09 Jul '09

09 Jul '09

Author: ceki Date: Thu Jul 9 17:37:06 2009 New Revision: 2334 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java - copied, changed from r2331, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java Log: - minor variable renaming in JoranConfiguratorBase - Renamed TrivialcConfiguratorTest as TrivialConfiguratorTest Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Thu Jul 9 17:37:06 2009 @@ -80,13 +80,13 @@ @Override protected void addImplicitRules(Interpreter interpreter) { // The following line adds the capability to parse nested components - NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(); - nestedIA.setContext(context); - interpreter.addImplicitAction(nestedIA); + NestedComplexPropertyIA nestedComplexPropertyIA = new NestedComplexPropertyIA(); + nestedComplexPropertyIA.setContext(context); + interpreter.addImplicitAction(nestedComplexPropertyIA); - NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(); - nestedSimpleIA.setContext(context); - interpreter.addImplicitAction(nestedSimpleIA); + NestedBasicPropertyIA nestedBasicIA = new NestedBasicPropertyIA(); + nestedBasicIA.setContext(context); + interpreter.addImplicitAction(nestedBasicIA); } @Override Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java Thu Jul 9 17:37:06 2009 @@ -14,7 +14,7 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -(a)SuiteClasses({SkippingInInterpreterTest.class, TrivialcConfiguratorTest.class, ch.qos.logback.core.joran.action.PackageTest.class, +(a)SuiteClasses({SkippingInInterpreterTest.class, TrivialConfiguratorTest.class, ch.qos.logback.core.joran.action.PackageTest.class, ch.qos.logback.core.joran.event.PackageTest.class, ch.qos.logback.core.joran.spi.PackageTest.class, ch.qos.logback.core.joran.replay.PackageTest.class, Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java (from r2331, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java Thu Jul 9 17:37:06 2009 @@ -35,7 +35,7 @@ import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; -public class TrivialcConfiguratorTest { +public class TrivialConfiguratorTest { Context context = new ContextBase(); HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>();

1 0

[JIRA] Created: (LBCORE-107) JoranConfiguratorBase does not set context on NestedBasicPropertyIA
by Lóránt Pintér (JIRA) 09 Jul '09

09 Jul '09

JoranConfiguratorBase does not set context on NestedBasicPropertyIA ------------------------------------------------------------------- Key: LBCORE-107 URL: http://jira.qos.ch/browse/LBCORE-107 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.15 Reporter: Lóránt Pintér Assignee: Logback dev list In JoranConfiguratorBase.addImplicitRules() two ImplicitActions are created, but the context on them is set incorrectly. While nestedIA.setContext() gets called twice, nestedSimpleIA.setContext() does not get called at all. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

svn commit: r2333 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 09 Jul '09

09 Jul '09

Author: ceki Date: Thu Jul 9 16:58:27 2009 New Revision: 2333 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Log: Fix LBCORE-107 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Thu Jul 9 16:58:27 2009 @@ -1,7 +1,7 @@ /** - * Logback: the generic, reliable, fast and flexible logging framework for Java. + * Logback: the generic, reliable, fast and flexible logging framework. * - * Copyright (C) 2000-2007, QOS.ch + * Copyright (C) 2000-2009, 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 @@ -85,7 +85,7 @@ interpreter.addImplicitAction(nestedIA); NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(); - nestedIA.setContext(context); + nestedSimpleIA.setContext(context); interpreter.addImplicitAction(nestedSimpleIA); }

1 0

[JIRA] Created: (LBCLASSIC-142) Rolling must be thread safe
by Ceki Gulcu (JIRA) 09 Jul '09

09 Jul '09

Rolling must be thread safe --------------------------- Key: LBCLASSIC-142 URL: http://jira.qos.ch/browse/LBCLASSIC-142 Project: logback-classic Issue Type: Sub-task Affects Versions: 0.9.16 Reporter: Ceki Gulcu Assignee: Logback dev list Priority: Blocker Rolling should be thread safe. Recent changes in code have undermined thread safety during rolling. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 3

svn commit: r2332 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/rolling test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Jul '09

09 Jul '09

Author: ceki Date: Thu Jul 9 13:46:33 2009 New Revision: 2332 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Log: Improved testing. In relation with LBCLASSIC-142 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java Thu Jul 9 13:46:33 2009 @@ -46,7 +46,6 @@ } public void start() { - // set the LR for our utility object util.setContext(this.context); if (fileNamePatternStr != null) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Thu Jul 9 13:46:33 2009 @@ -99,8 +99,9 @@ * */ public synchronized void rollover() { - // Note: synchronization at this point is unnecessary as the doAppend - // is already synched + // Note: This method needs to be synchronized because it needs exclusive + // acces while + // it closes and then re-opens the target file. // // make sure to close the hereto active log file! Renaming under windows @@ -130,6 +131,9 @@ protected void subAppend(E event) { // The roll-over check must precede actual writing. This is the // only correct behavior for time driven triggers. + + // We need to synchronize on triggeringPolicy so that only one rollover + // occurs at a time synchronized (triggeringPolicy) { if (triggeringPolicy.isTriggeringEvent(activeFile, event)) { rollover(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Thu Jul 9 13:46:33 2009 @@ -22,8 +22,9 @@ public class MultiThreadedRollingTest { final static int NUM_THREADS = 10; - final static int TOTAL_DURATION = 4000; - + final static int TOTAL_DURATION = 2000; + RunnableWithCounterAndDone[] runnableArray; + Layout<Object> layout; Context context = new ContextBase(); @@ -38,13 +39,21 @@ layout = new EchoLayout<Object>(); File outputDir = new File(outputDirStr); outputDir.mkdirs(); - + rfa.setName("rolling"); rfa.setLayout(layout); rfa.setContext(context); rfa.setFile(outputDirStr + "output.log"); - String datePattern = "yyyy-MM-dd'T'HH_mm_ss_SSS"; + } + + @After + public void tearDown() throws Exception { + rfa.stop(); + } + + public void setUpTImeBasedTriggeringPolicy(RollingFileAppender<Object> rfa) { + String datePattern = "yyyy-MM-dd'T'HH_mm_ss_SSS"; TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); tbrp.setFileNamePattern(outputDirStr + "test-%d{" + datePattern + "}"); tbrp.setContext(context); @@ -55,11 +64,25 @@ rfa.start(); } - @After - public void tearDown() throws Exception { - rfa.stop(); + public void setUpSizeBasedTriggeringPolicy(RollingFileAppender<Object> rfa) { + SizeBasedTriggeringPolicy<Object> zbtp = new SizeBasedTriggeringPolicy<Object>(); + zbtp.setContext(context); + zbtp.setMaxFileSize("100KB"); + + zbtp.start(); + rfa.setTriggeringPolicy(zbtp); + + FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy(); + fwrp.setContext(context); + fwrp.setFileNamePattern(outputDirStr + "test-%i.log"); + fwrp.setMaxIndex(10); + fwrp.setMinIndex(0); + fwrp.setParent(rfa); + fwrp.start(); + rfa.setRollingPolicy(fwrp); + rfa.start(); } - + RunnableWithCounterAndDone[] buildRunnableArray() { RunnableWithCounterAndDone[] runnableArray = new RunnableWithCounterAndDone[NUM_THREADS]; for (int i = 0; i < NUM_THREADS; i++) { @@ -69,18 +92,89 @@ } @Test - public void executeHarness() throws InterruptedException { - MultiThreadedHarness multiThreadedHarness = new MultiThreadedHarness(TOTAL_DURATION); - RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(); - multiThreadedHarness.execute(runnableArray); - StatusPrinter.print(context); + public void multiThreadedTimedBased() throws InterruptedException { + setUpTImeBasedTriggeringPolicy(rfa); + executeHarness(); + printScriptForTimeBased(); + } + + @Test + public void multiThreadedSizeBased() throws InterruptedException { + setUpSizeBasedTriggeringPolicy(rfa); + executeHarness(); + printScriptForSizeBased(); + } + + private void printScriptHeader(String type) { + out("# ===================================================="); + out("# Adapt this scipt to check the exactness of the output "); + out("# produced by "+type+" test"); + out("# ===================================================="); + out("# "); + out("# cd to "+outputDirStr); + + } + + private void printCommonScriptCore() { + out(""); + out("for t in $(seq 0 1 " + (NUM_THREADS - 1) + ")"); + out("do"); + out(" echo \"Testing results of thread $t\""); + out(" grep \"$t \" aggregated | cut -d ' ' -f 2 > ${t}-sample"); + out(" for j in $(seq 1 1 ${end[$t]}); do echo $j; done > ${t}-witness"); + out(" diff -q -w ${t}-sample ${t}-witness;"); + out(" res=$?"); + out(" if [ $res != \"0\" ]; then"); + out(" echo \"FAILED for $t\""); + out(" exit 1"); + out(" fi"); + out("done"); + out(""); + out("echo SUCCESS"); + } + + private void printScriptForTimeBased() { + printScriptHeader("TimeBased"); + for (int i = 0; i < NUM_THREADS; i++) { + out("end[" + i + "]=" + this.runnableArray[i].getCounter()); + } + out(""); + out("rm aggregated"); + out("cat test* output.log >> aggregated"); + printCommonScriptCore(); + + } + + private void printScriptForSizeBased() { + printScriptHeader("SizeBased"); + for (int i = 0; i < NUM_THREADS; i++) { + out("end[" + i + "]=" + this.runnableArray[i].getCounter()); + } + out(""); + out("rm aggregated"); + out("Modify the integer set to include all test-* files"); + out("for i in 3 2 1 0; do cat test-$i.log >> aggregated; done"); + out("cat output.log >> aggregated"); + out(""); + printCommonScriptCore(); + } + + private void out(String msg) { + System.out.println(msg); + } + + private void executeHarness() throws InterruptedException { + MultiThreadedHarness multiThreadedHarness = new MultiThreadedHarness( + TOTAL_DURATION); + this.runnableArray = buildRunnableArray(); + multiThreadedHarness.execute(runnableArray); + StatusChecker checker = new StatusChecker(context.getStatusManager()); - if(!checker.isErrorFree()) { + if (!checker.isErrorFree()) { fail("errors reported"); StatusPrinter.print(context); } - } long diff(long start) { @@ -90,6 +184,7 @@ static class RFARunnable extends RunnableWithCounterAndDone { RollingFileAppender<Object> rfa; int id; + RFARunnable(int id, RollingFileAppender<Object> rfa) { this.id = id; this.rfa = rfa; @@ -100,9 +195,8 @@ counter++; rfa.doAppend(id + " " + counter); } - System.out.println("id="+id + ", counter="+counter + " on exit"); } - + } }

1 0

svn commit: r2331 - logback/trunk/logback-core/src/test
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 15:46:14 2009 New Revision: 2331 Added: logback/trunk/logback-core/src/test/multiThreadSanityCheck.sh (contents, props changed) Log: a initial check in for a manual sanity check script Added: logback/trunk/logback-core/src/test/multiThreadSanityCheck.sh ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/multiThreadSanityCheck.sh Wed Jul 8 15:46:14 2009 @@ -0,0 +1,29 @@ + + +end[0]=116723 +end[1]=113160 +end[2]=100117 +end[3]=118897 +end[4]=111249 +end[5]=119030 +end[6]=106358 +end[7]=107372 +end[8]=113765 +end[9]=110767 + + +for t in $(seq 0 1 9) +do + echo doing $t + grep "$t " aggregated |cut -d ' ' -f 2 > $t-def + for i in $(seq 1 1 ${end[$t]}); do echo $i; done > $t-wit + echo "diffing thread $t" + diff -q $t-def $t-wit + res=$? + if [ $res != "0" ]; then + echo "FAILED for $t" + exit 1; + fi +done + +echo SUCCESS \ No newline at end of file

1 0

svn commit: r2330 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 15:10:46 2009 New Revision: 2330 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java Log: Adde MultiThreadedRollingTest to the relevant PackagerTest Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java Wed Jul 8 15:10:46 2009 @@ -6,6 +6,7 @@ @RunWith(Suite.class) @Suite.SuiteClasses( { RenamingTest.class, SizeBasedRollingTest.class, TimeBasedRollingTest.class, TimeBasedRollingWithCleanTest.class, + MultiThreadedRollingTest.class, ch.qos.logback.core.rolling.helper.PackageTest.class }) public class PackageTest { }

1 0

svn commit: r2329 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/rolling test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 15:09:11 2009 New Revision: 2329 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Log: having the rollover() method in RollingFileAppender synchronized have the tests passing Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Wed Jul 8 15:09:11 2009 @@ -98,7 +98,7 @@ * <code>File</code> is truncated with no backup files created. * */ - public void rollover() { + public synchronized void rollover() { // Note: synchronization at this point is unnecessary as the doAppend // is already synched Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Wed Jul 8 15:09:11 2009 @@ -21,8 +21,8 @@ public class MultiThreadedRollingTest { - final static int NUM_THREADS = 5; - final static int TOTAL_DURATION = 2000; + final static int NUM_THREADS = 10; + final static int TOTAL_DURATION = 4000; Layout<Object> layout; Context context = new ContextBase();

1 0

svn commit: r2328 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core main/java/ch/qos/logback/core/rolling main/java/ch/qos/logback/core/rolling/helper test/java/ch/qos/logback/core/contention test/java/ch/qos/logback/core/rolling test/java/ch/qos/logback/core/status
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 15:02:33 2009 New Revision: 2328 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/PeriodicityType.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Log: Working on thread safety of RollingAppender, related to LBCLASSIC-142 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Wed Jul 8 15:02:33 2009 @@ -22,8 +22,8 @@ /** * FileAppender appends log events to a file. * - * For more informatio about this appender, please refer to the online manual at - * http://logback.qos.ch/manual/appenders.html#FileAppender + * For more information about this appender, please refer to the online manual + * at http://logback.qos.ch/manual/appenders.html#FileAppender * * @author Ceki Gülcü */ @@ -66,13 +66,13 @@ * the file to append to. */ public void setFile(String file) { - if(file == null) { + if (file == null) { fileName = file; } else { // Trim spaces from both ends. The users probably does not want // trailing spaces in file names. String val = file.trim(); - fileName = val; + fileName = val; } } @@ -90,7 +90,6 @@ return append; } - /** * This method is used by derived classes to obtain the raw file property. * Regular users should not be calling this method. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Wed Jul 8 15:02:33 2009 @@ -52,13 +52,13 @@ addError("For more information, please visit http://logback.qos.ch/codes.html#rfa_no_rp"); return; } - - if(isPrudent()) { - if(rawFileProperty() != null) { + + if (isPrudent()) { + if (rawFileProperty() != null) { addWarn("Setting \"File\" property to null on account of prudent mode"); - setFile(null); + setFile(null); } - if(rollingPolicy.getCompressionMode() != CompressionMode.NONE) { + if (rollingPolicy.getCompressionMode() != CompressionMode.NONE) { addError("Compression is not supported in prudent mode. Aborting"); return; } @@ -73,14 +73,13 @@ public void setFile(String file) { // http://jira.qos.ch/browse/LBCORE-94 // allow setting the file name to null if mandated by prudent mode - if(file != null && ((triggeringPolicy != null) || (rollingPolicy != null))) { + if (file != null && ((triggeringPolicy != null) || (rollingPolicy != null))) { addError("File property must be set before any triggeringPolicy or rollingPolicy properties"); addError("Visit http://logback.qos.ch/codes.html#rfa_file_after for more information"); } super.setFile(file); } - @Override public String getFile() { return rollingPolicy.getActiveFileName(); @@ -131,8 +130,10 @@ protected void subAppend(E event) { // The roll-over check must precede actual writing. This is the // only correct behavior for time driven triggers. - if (triggeringPolicy.isTriggeringEvent(activeFile, event)) { - rollover(); + synchronized (triggeringPolicy) { + if (triggeringPolicy.isTriggeringEvent(activeFile, event)) { + rollover(); + } } super.subAppend(event); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/PeriodicityType.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/PeriodicityType.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/PeriodicityType.java Wed Jul 8 15:02:33 2009 @@ -1,16 +1,24 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, 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.rolling.helper; public enum PeriodicityType { - ERRONEOUS, TOP_OF_SECOND, TOP_OF_MINUTE, TOP_OF_HOUR, HALF_DAY, TOP_OF_DAY, TOP_OF_WEEK, TOP_OF_MONTH; + ERRONEOUS, TOP_OF_MILLISECOND, TOP_OF_SECOND, TOP_OF_MINUTE, TOP_OF_HOUR, HALF_DAY, TOP_OF_DAY, TOP_OF_WEEK, TOP_OF_MONTH; - // The followed list is assued to be in + // The followed list consists of valid periodicy types in increasing period + // lengths static PeriodicityType[] VALID_ORDERED_LIST = new PeriodicityType[] { - PeriodicityType.TOP_OF_SECOND, - PeriodicityType.TOP_OF_MINUTE, - PeriodicityType.TOP_OF_HOUR, - PeriodicityType.TOP_OF_DAY, - PeriodicityType.TOP_OF_WEEK, + TOP_OF_MILLISECOND, PeriodicityType.TOP_OF_SECOND, + PeriodicityType.TOP_OF_MINUTE, PeriodicityType.TOP_OF_HOUR, + PeriodicityType.TOP_OF_DAY, PeriodicityType.TOP_OF_WEEK, PeriodicityType.TOP_OF_MONTH }; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java Wed Jul 8 15:02:33 2009 @@ -75,7 +75,8 @@ if (datePattern != null) { for (PeriodicityType i : PeriodicityType.VALID_ORDERED_LIST) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat(datePattern); - simpleDateFormat.setTimeZone(GMT_TIMEZONE); // all date formatting done in GMT + simpleDateFormat.setTimeZone(GMT_TIMEZONE); // all date formatting done + // in GMT String r0 = simpleDateFormat.format(epoch); rollingCalendar.setType(i); @@ -90,44 +91,41 @@ } } // we failed - return PeriodicityType.ERRONEOUS; + return PeriodicityType.ERRONEOUS; } public void printPeriodicity(ContextAwareBase cab) { switch (type) { + case TOP_OF_MILLISECOND: + cab.addInfo("Roll-over every millisecond."); + break; + case TOP_OF_SECOND: cab.addInfo("Roll-over every second."); - break; case TOP_OF_MINUTE: cab.addInfo("Roll-over every minute."); - break; case TOP_OF_HOUR: cab.addInfo("Roll-over at the top of every hour."); - break; case HALF_DAY: cab.addInfo("Roll-over at midday and midnight."); - break; case TOP_OF_DAY: cab.addInfo("Roll-over at midnight."); - break; case TOP_OF_WEEK: cab.addInfo("Rollover at the start of week."); - break; case TOP_OF_MONTH: cab.addInfo("Rollover at start of every month."); - break; default: @@ -139,17 +137,19 @@ this.setTime(now); switch (type) { + case TOP_OF_MILLISECOND: + this.add(Calendar.MILLISECOND, periods); + break; + case TOP_OF_SECOND: this.set(Calendar.MILLISECOND, 0); this.add(Calendar.SECOND, periods); - break; case TOP_OF_MINUTE: this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.MINUTE, periods); - break; case TOP_OF_HOUR: @@ -157,7 +157,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.HOUR_OF_DAY, periods); - break; case TOP_OF_DAY: @@ -166,7 +165,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.DATE, periods); - break; case TOP_OF_WEEK: @@ -176,7 +174,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.WEEK_OF_YEAR, periods); - break; case TOP_OF_MONTH: @@ -186,7 +183,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.MONTH, periods); - break; default: @@ -195,7 +191,7 @@ return getTime(); } - + public Date getNextTriggeringDate(Date now) { return getRelativeDate(now, 1); } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java Wed Jul 8 15:02:33 2009 @@ -0,0 +1,65 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, 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.contention; + + +/** + * Useful scaffolding/harness to start and stop multiple threads. + * + * @author Joern Huxhorn + * @author Ralph Goers + * @author Ceki Gulcu + */ +public class MultiThreadedHarness { + + RunnableWithCounterAndDone[] runnableArray; + Thread[] threadArray; + final long overallDurationInMillis; + + public MultiThreadedHarness(long overallDurationInMillis) { + this.overallDurationInMillis = overallDurationInMillis; + } + + public void printEnvironmentInfo(String msg) { + System.out.println("=== " + msg + " ==="); + System.out.println("java.runtime.version = " + + System.getProperty("java.runtime.version")); + System.out.println("java.vendor = " + + System.getProperty("java.vendor")); + System.out.println("java.version = " + + System.getProperty("java.version")); + System.out.println("os.name = " + + System.getProperty("os.name")); + System.out.println("os.version = " + + System.getProperty("os.version")); + } + + public void execute(RunnableWithCounterAndDone[] runnableArray) + throws InterruptedException { + this.runnableArray = runnableArray; + Thread[] threadArray = new Thread[runnableArray.length]; + + for (int i = 0; i < runnableArray.length; i++) { + threadArray[i] = new Thread(runnableArray[i]); + } + for (Thread t : threadArray) { + t.start(); + } + // let the threads run for a while + Thread.sleep(overallDurationInMillis); + + for (RunnableWithCounterAndDone r : runnableArray) { + r.setDone(true); + } + for (Thread t : threadArray) { + t.join(); + } + } +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java Wed Jul 8 15:02:33 2009 @@ -1,8 +1,16 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, 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.contention; /** - * * Useful scaffolding to measure the throughput of certain operations when * invoked by multiple threads. * @@ -10,51 +18,13 @@ * @author Ralph Goers * @author Ceki Gulcu */ -public class ThreadedThroughputCalculator { +public class ThreadedThroughputCalculator extends MultiThreadedHarness { - RunnableWithCounterAndDone[] runnableArray; - Thread[] threadArray; - final long overallDurationInMillis; public ThreadedThroughputCalculator(long overallDurationInMillis) { - this.overallDurationInMillis = overallDurationInMillis; - } - - public void printEnvironmentInfo(String msg) { - System.out.println("=== " + msg + " ==="); - System.out.println("java.runtime.version = " - + System.getProperty("java.runtime.version")); - System.out.println("java.vendor = " - + System.getProperty("java.vendor")); - System.out.println("java.version = " - + System.getProperty("java.version")); - System.out.println("os.name = " - + System.getProperty("os.name")); - System.out.println("os.version = " - + System.getProperty("os.version")); + super(overallDurationInMillis); } - public void execute(RunnableWithCounterAndDone[] runnableArray) - throws InterruptedException { - this.runnableArray = runnableArray; - Thread[] threadArray = new Thread[runnableArray.length]; - - for (int i = 0; i < runnableArray.length; i++) { - threadArray[i] = new Thread(runnableArray[i]); - } - for (Thread t : threadArray) { - t.start(); - } - // let the threads run for a while - Thread.sleep(overallDurationInMillis); - - for (RunnableWithCounterAndDone r : runnableArray) { - r.setDone(true); - } - for (Thread t : threadArray) { - t.join(); - } - } public void printThroughput(String msg) throws InterruptedException { printThroughput(msg, false); } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Wed Jul 8 15:02:33 2009 @@ -0,0 +1,108 @@ +package ch.qos.logback.core.rolling; + +import static org.junit.Assert.fail; + +import java.io.File; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.contention.MultiThreadedHarness; +import ch.qos.logback.core.contention.RunnableWithCounterAndDone; +import ch.qos.logback.core.layout.EchoLayout; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.CoreTestConstants; +import ch.qos.logback.core.util.StatusPrinter; + +public class MultiThreadedRollingTest { + + final static int NUM_THREADS = 5; + final static int TOTAL_DURATION = 2000; + + Layout<Object> layout; + Context context = new ContextBase(); + + int diff = RandomUtil.getPositiveInt(); + String outputDirStr = CoreTestConstants.OUTPUT_DIR_PREFIX + "multi-" + diff + + "/"; + + RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); + + @Before + public void setUp() throws Exception { + layout = new EchoLayout<Object>(); + File outputDir = new File(outputDirStr); + outputDir.mkdirs(); + + rfa.setName("rolling"); + rfa.setLayout(layout); + rfa.setContext(context); + rfa.setFile(outputDirStr + "output.log"); + String datePattern = "yyyy-MM-dd'T'HH_mm_ss_SSS"; + + TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); + tbrp.setFileNamePattern(outputDirStr + "test-%d{" + datePattern + "}"); + tbrp.setContext(context); + tbrp.setParent(rfa); + tbrp.start(); + + rfa.setRollingPolicy(tbrp); + rfa.start(); + } + + @After + public void tearDown() throws Exception { + rfa.stop(); + } + + RunnableWithCounterAndDone[] buildRunnableArray() { + RunnableWithCounterAndDone[] runnableArray = new RunnableWithCounterAndDone[NUM_THREADS]; + for (int i = 0; i < NUM_THREADS; i++) { + runnableArray[i] = new RFARunnable(i, rfa); + } + return runnableArray; + } + + @Test + public void executeHarness() throws InterruptedException { + MultiThreadedHarness multiThreadedHarness = new MultiThreadedHarness(TOTAL_DURATION); + RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(); + multiThreadedHarness.execute(runnableArray); + StatusPrinter.print(context); + + StatusChecker checker = new StatusChecker(context.getStatusManager()); + if(!checker.isErrorFree()) { + fail("errors reported"); + StatusPrinter.print(context); + } + + } + + long diff(long start) { + return System.currentTimeMillis() - start; + } + + static class RFARunnable extends RunnableWithCounterAndDone { + RollingFileAppender<Object> rfa; + int id; + RFARunnable(int id, RollingFileAppender<Object> rfa) { + this.id = id; + this.rfa = rfa; + } + + public void run() { + while (!isDone()) { + counter++; + rfa.doAppend(id + " " + counter); + } + System.out.println("id="+id + ", counter="+counter + " on exit"); + } + + } + +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java Wed Jul 8 15:02:33 2009 @@ -5,7 +5,7 @@ @RunWith(Suite.class) @Suite.SuiteClasses( { RenamingTest.class, SizeBasedRollingTest.class, - TimeBasedRollingTest.class, + TimeBasedRollingTest.class, TimeBasedRollingWithCleanTest.class, ch.qos.logback.core.rolling.helper.PackageTest.class }) public class PackageTest { } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Wed Jul 8 15:02:33 2009 @@ -24,6 +24,11 @@ this.sm = sm; } + public boolean isErrorFree() { + int level = sm.getLevel(); + return level < Status.ERROR; + } + public boolean containsMatch(int level, String regex) { Pattern p = Pattern.compile(regex);

1 0