December 2009 - logback-dev

branch, master, updated. 14c0e07767c55dfc29dcbe181e6298d46ce00ca2
by git-noreply＠pixie.qos.ch 02 Dec '09

02 Dec '09

The branch, master has been updated via 14c0e07767c55dfc29dcbe181e6298d46ce00ca2 (commit) from 2c6ba170e7bccab8d4f8020dc698b90b5acc57ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=14c0e07767c55dfc29dcbe18… http://github.com/ceki/logback/commit/14c0e07767c55dfc29dcbe181e6298d46ce00… commit 14c0e07767c55dfc29dcbe181e6298d46ce00ca2 Author: Ceki Gulcu <ceki(a)rhino.localdomain> Date: Wed Dec 2 17:00:59 2009 -0500 let the Green mail server start diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java index dee08d3..83c928e 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java @@ -66,6 +66,7 @@ public class SMTPAppender_GreenTest { ServerSetup.PROTOCOL_SMTP); greenMail = new GreenMail(serverSetup); greenMail.start(); + Thread.yield(); } @After diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java index 3322ae8..fe9a0c8 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java @@ -139,7 +139,7 @@ public class TimeBasedRollingWithConfigFileTest extends // for various reasons, it is extremely difficult to have the files // match exactly the expected archive files. Thus, we aim for // an approximate match - assertTrue("eCount=" + eCount + "expectedFilenameList.size=" + assertTrue("exitenceCount=" + eCount + ", expectedFilenameList.size=" + expectedFilenameList.size(), eCount >= 5 && eCount > expectedFilenameList.size() / 2); } ----------------------------------------------------------------------- Summary of changes: .../classic/net/SMTPAppender_GreenTest.java | 1 + .../TimeBasedRollingWithConfigFileTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 2c6ba170e7bccab8d4f8020dc698b90b5acc57ea
by git-noreply＠pixie.qos.ch 02 Dec '09

02 Dec '09

The branch, master has been updated via 2c6ba170e7bccab8d4f8020dc698b90b5acc57ea (commit) from 6104cf6a8f59bddcfba11e95965fbc98a8bad93e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=2c6ba170e7bccab8d4f8020d… http://github.com/ceki/logback/commit/2c6ba170e7bccab8d4f8020dc698b90b5acc5… commit 2c6ba170e7bccab8d4f8020dc698b90b5acc57ea Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Dec 4 18:06:29 2009 +0100 making sure that tests pass on Linux as well diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index 76dcf1d..6d08674 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -43,29 +43,34 @@ public class ReconfigureOnChangeTest { final static int THREAD_COUNT = 5; final static int LOOP_LEN = 1000 * 1000; - // the space in the file name mandated by http://jira.qos.ch/browse/LBCORE-119 + // the space in the file name mandated by + // http://jira.qos.ch/browse/LBCORE-119 final static String SCAN1_FILE_AS_STR = TeztConstants.TEST_DIR_PREFIX + "input/turbo/scan 1.xml"; // it actually takes time for Windows to propagate file modification changes // values below 100 milliseconds can be problematic // the same propagation latency occurs in Linux but is even larger (>600 ms) - static int SLEEP_BETWEEN_UPDATES = 250; + final static int DEFAULT_SLEEP_BETWEEN_UPDATES = 250; - // we won't at least 10 re-configurations - static int TOTAL_TEST_DURATION = SLEEP_BETWEEN_UPDATES * 10; + int sleepBetweenUpdates = DEFAULT_SLEEP_BETWEEN_UPDATES; + + static int totalTestDuration; LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass()); - MultiThreadedHarness harness = new MultiThreadedHarness(TOTAL_TEST_DURATION); + MultiThreadedHarness harness; @Before public void setUp() { // take into account propagation latency occurs on Linux if (Env.isLinux()) { - SLEEP_BETWEEN_UPDATES = 850; + sleepBetweenUpdates = 850; + totalTestDuration = sleepBetweenUpdates * 5; + } else { + totalTestDuration = sleepBetweenUpdates * 10; } - + harness = new MultiThreadedHarness(totalTestDuration); } void configure(File file) throws JoranException { @@ -83,9 +88,8 @@ public class ReconfigureOnChangeTest { return rArray; } - - - @Test // See http://jira.qos.ch/browse/LBCORE-119 + @Test + // See http://jira.qos.ch/browse/LBCORE-119 public void fileToURLAndBack() throws MalformedURLException { File file = new File("a b.xml"); URL url = file.toURI().toURL(); @@ -93,7 +97,7 @@ public class ReconfigureOnChangeTest { File back = rocf.convertToFile(url); assertEquals(file.getName(), back.getName()); } - + // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter @Test public void scan1() throws JoranException, IOException, InterruptedException { @@ -137,7 +141,8 @@ public class ReconfigureOnChangeTest { @Test public void directPerfTest() throws MalformedURLException { if (Env.isLinux()) { - // for some reason this test does not pass on Linux (AMD 64 bit, Dual Core + // for some reason this test does not pass on Linux (AMD 64 bit, + // Dual Core // Opteron 170) return; } @@ -167,7 +172,8 @@ public class ReconfigureOnChangeTest { @Test public void indirectPerfTest() throws MalformedURLException { if (Env.isLinux()) { - // for some reason this test does not pass on Linux (AMD 64 bit, Dual Core + // for some reason this test does not pass on Linux (AMD 64 bit, + // Dual Core // Opteron 170) return; } @@ -208,7 +214,7 @@ public class ReconfigureOnChangeTest { public void run() { while (!isDone()) { try { - Thread.sleep(SLEEP_BETWEEN_UPDATES); + Thread.sleep(sleepBetweenUpdates); } catch (InterruptedException e) { } if (isDone()) { diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 6dd2dc1..9f9e3ec 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -36,6 +36,10 @@ 2.1. + Due to a clerical error <a + href="http://jira.qos.ch/browse/LBCORE-26">LBCORE-26</a> has + re-raised its ugly head. It has now been tamed for good. + Fixed Private-Package and Export-Package sections in logback-classic.jar MANIFEST as reported in <a href="http://jira.qos.ch/browse/LBCLASSIC-165">LBCLASSIC-165</a> ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeTest.java | 34 +++++++++++-------- logback-site/src/site/pages/news.html | 4 ++ 2 files changed, 24 insertions(+), 14 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 6104cf6a8f59bddcfba11e95965fbc98a8bad93e
by git-noreply＠pixie.qos.ch 02 Dec '09

02 Dec '09

The branch, master has been updated via 6104cf6a8f59bddcfba11e95965fbc98a8bad93e (commit) from 1c840c987eca8712860eab12cfc7dbe09441faf5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=6104cf6a8f59bddcfba11e95… http://github.com/ceki/logback/commit/6104cf6a8f59bddcfba11e95965fbc98a8bad… commit 6104cf6a8f59bddcfba11e95965fbc98a8bad93e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Dec 2 15:26:06 2009 +0100 fixed intermittent failures in TimeBasedRollingTest diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java index 54a7e1b..561dc55 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java @@ -23,6 +23,9 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; @@ -147,6 +150,13 @@ public class ScaffoldingForRollingTests { return new Date(currentTime - delta - 1000); } + static void waitForCompression(TimeBasedRollingPolicy<Object> tbrp) + throws InterruptedException, ExecutionException, TimeoutException { + if (tbrp.future != null && !tbrp.future.isDone()) { + tbrp.future.get(200, TimeUnit.MILLISECONDS); + } + } + protected void addExpectedFileName_ByDate(String testId, Date date, boolean gzExtension) { diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java index c50fab9..46b3c2c 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java @@ -16,7 +16,6 @@ package ch.qos.logback.core.rolling; import static org.junit.Assert.assertTrue; import java.io.File; -import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; @@ -54,14 +53,12 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { RollingFileAppender<Object> rfa2 = new RollingFileAppender<Object>(); TimeBasedRollingPolicy<Object> tbrp2 = new TimeBasedRollingPolicy<Object>(); - @Before @Override public void setUp() { super.setUp(); } - @After public void tearDown() { } @@ -74,8 +71,9 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { } } - void initTRBP(RollingFileAppender<Object> rfa, TimeBasedRollingPolicy<Object> tbrp, - String filenamePattern, long givenTime) { + void initTRBP(RollingFileAppender<Object> rfa, + TimeBasedRollingPolicy<Object> tbrp, String filenamePattern, + long givenTime) { tbrp.setContext(context); tbrp.setFileNamePattern(filenamePattern); tbrp.setParent(rfa); @@ -136,10 +134,9 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { rfa1.doAppend("Hello---" + i); incCurrentTime(500); tbrp1.timeBasedTriggering.setCurrentTime(currentTime); + waitForCompression(tbrp1); } - tbrp1.future.get(2000, TimeUnit.MILLISECONDS); - int i = 0; for (String fn : expectedFilenameList) { assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX @@ -176,7 +173,8 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { initRFA(rfa2, null); initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", tbrp1.timeBasedTriggering.getCurrentTime()); + + DATE_PATTERN_WITH_SECONDS + "}", tbrp1.timeBasedTriggering + .getCurrentTime()); for (int i = 0; i <= 2; i++) { addExpectedFileNamedIfItsTime_ByDate(testId, false); @@ -219,8 +217,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { // change the timestamp of the currently actively file File activeFile = new File(rfa1.getFile()); activeFile.setLastModified(currentTime); - - + initRFA(rfa2, testId2FileName(testId)); initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" + DATE_PATTERN_WITH_SECONDS + "}", currentTime); @@ -266,7 +263,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { // change the timestamp of the currently actively file File activeFile = new File(rfa1.getFile()); activeFile.setLastModified(currentTime); - + incCurrentTime(2000); initRFA(rfa2, randomOutputDir + "test4B.log"); @@ -344,11 +341,9 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { addExpectedFileNamedIfItsTime_ByDate(testId, true); incCurrentTime(500); tbrp1.timeBasedTriggering.setCurrentTime(currentTime); + waitForCompression(tbrp1); } - // wait for the compression task to finish - tbrp1.future.get(1000, TimeUnit.MILLISECONDS); - massageExpectedFilesToCorresponToCurrentTarget("test6.log"); int i = 0; @@ -363,7 +358,6 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { // utility methods // ========================================================================= - void massageExpectedFilesToCorresponToCurrentTarget(String file) { // we added one too many files by date expectedFilenameList.remove(expectedFilenameList.size() - 1); diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java index 679afed..ce708d5 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java @@ -65,7 +65,7 @@ public class TimeBasedRollingWithArchiveRemovalTest { TimeBasedFileNamingAndTriggeringPolicy<Object> tbfnatp = new DefaultTimeBasedFileNamingAndTriggeringPolicy<Object>(); @Before - public void setUp() throws Exception { + public void setUp() { context.setName("test"); } @@ -192,8 +192,7 @@ public class TimeBasedRollingWithArchiveRemovalTest { int ticksPerPeriod = 512; long runLength = simulatedNumberOfPeriods * ticksPerPeriod; - long i = 0; - for (; i < runLength; i++) { + for (long i = 0; i < runLength; i++) { rfa .doAppend("Hello ----------------------------------------------------------" + i); ----------------------------------------------------------------------- Summary of changes: .../core/rolling/ScaffoldingForRollingTests.java | 10 ++++++++ .../logback/core/rolling/TimeBasedRollingTest.java | 24 +++++++------------ .../TimeBasedRollingWithArchiveRemovalTest.java | 5 +-- 3 files changed, 21 insertions(+), 18 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Closed: (LBCORE-26) TimeBasedRollingPolicy append logs into a old log file, instead of rolling the log file.
by Ceki Gulcu (JIRA) 02 Dec '09

02 Dec '09

[ http://jira.qos.ch/browse/LBCORE-26?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu closed LBCORE-26. ---------------------------- Fix Version/s: 0.9.18 (was: 0.9.12) Resolution: Fixed Fixed in http://github.com/ceki/logback/commit/1c840c987eca8712860eab12cfc7dbe09441f… > TimeBasedRollingPolicy append logs into a old log file, instead of rolling the log file. > ---------------------------------------------------------------------------------------- > > Key: LBCORE-26 > URL: http://jira.qos.ch/browse/LBCORE-26 > Project: logback-core > Issue Type: Bug > Components: Rolling > Affects Versions: unspecified > Environment: Operating System: All > Platform: All > Reporter: Tsutomu YANO > Assignee: Ceki Gulcu > Priority: Critical > Fix For: 0.9.18 > > > If you use TimeBasedRollingPolicy to rollover a log file and no log wasn't wrote into the log beyond the timing of rollover, and if you restart your application, the log file doesn't roll, then new log will be appended into old log file. > EVIDENCE: > 1. in logback.xml, set your FileNamePattern like 'log.%d{yyyy-MM-dd_HH-mm}.log'. > 2. Simply do a kind of thing, which will make some logs into your log file. > 3. Wait for some minutes. > 4. restart your application. > 5. do a kind of thing, which will make some logs into your log file. > the FileNamePattern is 'log.%d{yyyy-MM-dd_HH-mm}.log', so the log file will be roll every minutes. On case 5 of above example, the log file should be roll over, because some minutes already have passed after last logs wrote into the log file. But the file didn't be roll overed. > THE CAUSE: > In start() method of TimeBasedRollingPolicy, you initialize a variable 'lastCheck' to System.currentTimeStamp(). So if you restart your application, the last check time will be set to just NOW. > you should initialize the variable to a last modified time of a current log file. > See below source code. from '//modified by Tsutomu YANO' to '//until here'. > SOURCE: > public void start() { > // set the LR for our utility object > util.setContext(this.context); > compress.setContext(this.context); > // find out period from the filename pattern > if (fileNamePatternStr != null) { > fileNamePattern = new FileNamePattern(fileNamePatternStr, this.context); > determineCompressionMode(); > } else { > addWarn(FNP_NOT_SET); > addWarn(SEE_FNP_NOT_SET); > throw new IllegalStateException(FNP_NOT_SET + SEE_FNP_NOT_SET); > } > DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); > if (dtc == null) { > throw new IllegalStateException("FileNamePattern [" + fileNamePattern.getPattern() + "] does not contain a valid DateToken"); > } > int len = fileNamePatternStr.length(); > switch (compressionMode) { > case Compress.GZ: > activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring(0, len - 3), this.context); > break; > case Compress.ZIP: > activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring(0, len - 4), this.context); > break; > case Compress.NONE: > activeFileNamePattern = fileNamePattern; > } > addInfo("Will use the pattern " + activeFileNamePattern + " for the active file"); > rc = new RollingCalendar(); > rc.init(dtc.getDatePattern()); > addInfo("The date pattern is '" + dtc.getDatePattern() + "' from file name pattern '" + fileNamePattern.getPattern() + "'."); > rc.printPeriodicity(this); > > //modified by Tsutomu YANO > //if a current log file exists, initialize a 'lastCheck' variable to the > //last modified date of the file. > File currentFile = new File(getParentFileName()); > if(currentFile.exists() && currentFile.canRead()) { > lastCheck.setTime(currentFile.lastModified()); > } else { > // currentTime = System.currentTimeMillis(); > lastCheck.setTime(getCurrentTime()); > } > //until here > > nextCheck = rc.getNextCheckMillis(lastCheck); > // Date nc = new Date(); > // nc.setTime(nextCheck); > } -- 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 0

branch, master, updated. 1c840c987eca8712860eab12cfc7dbe09441faf5
by git-noreply＠pixie.qos.ch 02 Dec '09

02 Dec '09

The branch, master has been updated via 1c840c987eca8712860eab12cfc7dbe09441faf5 (commit) from 12f248fab183df513aa84c1147f8781b69d3a18d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=1c840c987eca8712860eab12… http://github.com/ceki/logback/commit/1c840c987eca8712860eab12cfc7dbe09441f… commit 1c840c987eca8712860eab12cfc7dbe09441faf5 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Dec 4 14:47:05 2009 +0100 - All tests pass. LBCORE-26 has been fixed. diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java index 5276ae2..c50fab9 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java @@ -16,7 +16,6 @@ package ch.qos.logback.core.rolling; import static org.junit.Assert.assertTrue; import java.io.File; -import java.sql.Date; import java.util.concurrent.TimeUnit; import org.junit.After; @@ -215,12 +214,12 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { tbrp1.timeBasedTriggering.setCurrentTime(currentTime); } - File activeFile = new File(rfa1.getFile()); - - System.out.println("activeFile="+activeFile); - activeFile.setLastModified(currentTime); rfa1.stop(); + // change the timestamp of the currently actively file + File activeFile = new File(rfa1.getFile()); + activeFile.setLastModified(currentTime); + initRFA(rfa2, testId2FileName(testId)); initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" @@ -264,12 +263,9 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { rfa1.stop(); - - System.out.println("time before wait "+SDF.format(new Date(currentTime))); - + // change the timestamp of the currently actively file File activeFile = new File(rfa1.getFile()); activeFile.setLastModified(currentTime); - incCurrentTime(2000); @@ -277,7 +273,6 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" + DATE_PATTERN_WITH_SECONDS + "}", currentTime); - System.out.println("time after wait "+SDF.format(new Date(currentTime))); for (int i = 0; i <= 2; i++) { rfa2.doAppend("World---" + i); addExpectedFileNamedIfItsTime_ByDate(testId, false); ----------------------------------------------------------------------- Summary of changes: .../logback/core/rolling/TimeBasedRollingTest.java | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 12f248fab183df513aa84c1147f8781b69d3a18d
by git-noreply＠pixie.qos.ch 02 Dec '09

02 Dec '09

The branch, master has been updated via 12f248fab183df513aa84c1147f8781b69d3a18d (commit) from 21b667f88d347ecacf1cb3ef60d159a3eba71d89 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=12f248fab183df513aa84c11… http://github.com/ceki/logback/commit/12f248fab183df513aa84c1147f8781b69d3a… commit 12f248fab183df513aa84c1147f8781b69d3a18d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Dec 2 14:33:41 2009 +0100 - the check for the timestamp of the existing log file was missing hence the reapperance of LBCORE-26. Some tests still fail. Ongoing work. diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java b/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java index b1add24..81ea93e 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java @@ -20,8 +20,6 @@ import java.util.Map; import org.slf4j.helpers.MarkerIgnoringBase; -import ch.qos.logback.classic.ClassicConstants; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.CoreConstants; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java index 17eabe8..d4069f1 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java @@ -34,7 +34,6 @@ import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase; import ch.qos.logback.core.boolex.Matcher; import ch.qos.logback.core.filter.EvaluatorFilter; import ch.qos.logback.core.spi.FilterReply; -import ch.qos.logback.core.util.StatusPrinter; public class JaninoEventEvaluatorTest { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java b/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java index 651af43..9f86dc5 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java @@ -16,7 +16,6 @@ package ch.qos.logback.classic.control; import java.util.HashMap; import java.util.Map; -import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; import ch.qos.logback.core.CoreConstants; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java b/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java index ead333b..c5cc0e7 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java @@ -15,7 +15,6 @@ package ch.qos.logback.classic.control; import java.util.LinkedList; -import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; import ch.qos.logback.core.CoreConstants; diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java index 8c5a761..3d25940 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java @@ -40,7 +40,7 @@ public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedF Date dateOfElapsedPeriod = dateInCurrentPeriod; elapsedPeriodsFileName = tbrp.fileNamePatternWCS .convert(dateOfElapsedPeriod); - updateDateInCurrentPeriod(time); + setDateInCurrentPeriod(time); computeNextCheck(); return true; } else { diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java index 02cc66a..7e7206c 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java @@ -77,7 +77,7 @@ public class SizeAndTimeBasedFNATP<E> extends elapsedPeriodsFileName = tbrp.fileNamePatternWCS .convertMultipleArguments(dateInElapsedPeriod, currentPeriodsCounter); currentPeriodsCounter = 0; - updateDateInCurrentPeriod(time); + setDateInCurrentPeriod(time); computeNextCheck(); return true; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicy.java index 20f2e52..fbdd13c 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicy.java @@ -13,8 +13,6 @@ */ package ch.qos.logback.core.rolling; -import java.util.Date; - import ch.qos.logback.core.rolling.helper.ArchiveRemover; import ch.qos.logback.core.spi.ContextAware; @@ -77,7 +75,10 @@ public interface TimeBasedFileNamingAndTriggeringPolicy<E> extends * Set some date in the current period. Only unit tests should invoke this * method. * + * WARNING: method removed. A unit test should not set the + * date in current period. It is the job of the FNATP to compute that. + * * @param date */ - void setDateInCurrentPeriod(Date date); + //void setDateInCurrentPeriod(Date date); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java index 4587f8c..b7f5fd8 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java @@ -13,6 +13,7 @@ */ package ch.qos.logback.core.rolling; +import java.io.File; import java.util.Date; import ch.qos.logback.core.rolling.helper.ArchiveRemover; @@ -20,25 +21,23 @@ import ch.qos.logback.core.rolling.helper.DateTokenConverter; import ch.qos.logback.core.rolling.helper.RollingCalendar; import ch.qos.logback.core.spi.ContextAwareBase; -abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends ContextAwareBase - implements TimeBasedFileNamingAndTriggeringPolicy<E> { +abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends + ContextAwareBase implements TimeBasedFileNamingAndTriggeringPolicy<E> { protected TimeBasedRollingPolicy<E> tbrp; - + protected ArchiveRemover archiveRemover = null; protected String elapsedPeriodsFileName; protected RollingCalendar rc; - - + protected long currentTime; - //indicate whether the time has been forced or not + // indicate whether the time has been forced or not protected boolean isTimeForced = false; protected Date dateInCurrentPeriod = null; - + protected long nextCheck; protected boolean started = false; - public boolean isStarted() { return started; } @@ -58,23 +57,32 @@ abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends Cont + "'."); rc.printPeriodicity(this); - // dateInCurrentPeriod can be set by test classes - // if it has not been set, we set it here + if (dateInCurrentPeriod == null) { - dateInCurrentPeriod = new Date(); - updateDateInCurrentPeriod(getCurrentTime()); + setDateInCurrentPeriod(new Date(getCurrentTime())); + + if (tbrp.getParentsRawFileProperty() != null) { + File currentFile = new File(tbrp.getParentsRawFileProperty()); + if (currentFile.exists() && currentFile.canRead()) { + setDateInCurrentPeriod(new Date(currentFile.lastModified())); + } + } } computeNextCheck(); } - + public void stop() { started = false; } - + protected void computeNextCheck() { nextCheck = rc.getNextTriggeringMillis(dateInCurrentPeriod); } + protected void setDateInCurrentPeriod(long now) { + dateInCurrentPeriod.setTime(now); + } + // allow Test classes to act on the dateInCurrentPeriod field to simulate old // log files needing rollover public void setDateInCurrentPeriod(Date _dateInCurrentPeriod) { @@ -93,11 +101,6 @@ abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends Cont return tbrp.fileNamePatternWCS.convert(dateInCurrentPeriod); } - - protected void updateDateInCurrentPeriod(long now) { - dateInCurrentPeriod.setTime(now); - } - public void setCurrentTime(long timeInMillis) { currentTime = timeInMillis; isTimeForced = true; @@ -111,7 +114,7 @@ abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends Cont return System.currentTimeMillis(); } } - + public void setTimeBasedRollingPolicy(TimeBasedRollingPolicy<E> _tbrp) { this.tbrp = _tbrp; diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java index 989585e..ee228d4 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java @@ -60,9 +60,9 @@ public class SizeAndTimeBasedFNATP_Test extends tbrp.setFileNamePattern(filenamePattern); tbrp.setParent(rfa); tbrp.timeBasedTriggering.setCurrentTime(givenTime); - if (lastCheck != 0) { - tbrp.timeBasedTriggering.setDateInCurrentPeriod(new Date(lastCheck)); - } +// if (lastCheck != 0) { +// tbrp.timeBasedTriggering.setDateInCurrentPeriod(new Date(lastCheck)); +// } rfa.setRollingPolicy(tbrp); tbrp.start(); rfa.start(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java index 30b5c9c..5276ae2 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java @@ -15,6 +15,7 @@ package ch.qos.logback.core.rolling; import static org.junit.Assert.assertTrue; +import java.io.File; import java.sql.Date; import java.util.concurrent.TimeUnit; @@ -75,15 +76,12 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { } void initTRBP(RollingFileAppender<Object> rfa, TimeBasedRollingPolicy<Object> tbrp, - String filenamePattern, long givenTime, long lastCheck) { + String filenamePattern, long givenTime) { tbrp.setContext(context); tbrp.setFileNamePattern(filenamePattern); tbrp.setParent(rfa); tbrp.timeBasedTriggering = new DefaultTimeBasedFileNamingAndTriggeringPolicy<Object>(); tbrp.timeBasedTriggering.setCurrentTime(givenTime); - if (lastCheck != 0) { - tbrp.timeBasedTriggering.setDateInCurrentPeriod(new Date(lastCheck)); - } rfa.setRollingPolicy(tbrp); tbrp.start(); rfa.start(); @@ -97,7 +95,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { String testId = "test1"; initRFA(rfa1, null); initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", currentTime, 0); + + DATE_PATTERN_WITH_SECONDS + "}", currentTime); // compute the current filename addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -127,7 +125,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { String testId = "test2"; initRFA(rfa1, null); initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}.gz", currentTime, 0); + + DATE_PATTERN_WITH_SECONDS + "}.gz", currentTime); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), true); incCurrentTime(1100); @@ -160,7 +158,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { initRFA(rfa1, null); initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", currentTime, 0); + + DATE_PATTERN_WITH_SECONDS + "}", currentTime); // a new file is created by virtue of rfa.start(); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -179,7 +177,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { initRFA(rfa2, null); initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", tbrp1.timeBasedTriggering.getCurrentTime(), 0); + + DATE_PATTERN_WITH_SECONDS + "}", tbrp1.timeBasedTriggering.getCurrentTime()); for (int i = 0; i <= 2; i++) { addExpectedFileNamedIfItsTime_ByDate(testId, false); @@ -203,7 +201,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { String testId = "test4"; initRFA(rfa1, testId2FileName(testId)); initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", currentTime, 0); + + DATE_PATTERN_WITH_SECONDS + "}", currentTime); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -217,11 +215,16 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { tbrp1.timeBasedTriggering.setCurrentTime(currentTime); } + File activeFile = new File(rfa1.getFile()); + + System.out.println("activeFile="+activeFile); + activeFile.setLastModified(currentTime); rfa1.stop(); + initRFA(rfa2, testId2FileName(testId)); initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", currentTime, currentTime); + + DATE_PATTERN_WITH_SECONDS + "}", currentTime); for (int i = 0; i <= 2; i++) { rfa2.doAppend("World---" + i); @@ -245,7 +248,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { String testId = "test4B"; initRFA(rfa1, testId2FileName(testId)); initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", currentTime, 0); + + DATE_PATTERN_WITH_SECONDS + "}", currentTime); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -264,12 +267,15 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { System.out.println("time before wait "+SDF.format(new Date(currentTime))); - long fileTimestamp = currentTime; + File activeFile = new File(rfa1.getFile()); + activeFile.setLastModified(currentTime); + + incCurrentTime(2000); initRFA(rfa2, randomOutputDir + "test4B.log"); initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", currentTime, fileTimestamp); + + DATE_PATTERN_WITH_SECONDS + "}", currentTime); System.out.println("time after wait "+SDF.format(new Date(currentTime))); for (int i = 0; i <= 2; i++) { @@ -298,7 +304,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { initRFA(rfa1, testId2FileName(testId)); initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}", currentTime, 0); + + DATE_PATTERN_WITH_SECONDS + "}", currentTime); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -331,7 +337,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { initRFA(rfa1, testId2FileName(testId)); initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}.gz", currentTime, 0); + + DATE_PATTERN_WITH_SECONDS + "}.gz", currentTime); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), true); diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java index 1387f12..679afed 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java @@ -15,6 +15,7 @@ package ch.qos.logback.core.rolling; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileFilter; import java.util.ArrayList; @@ -37,7 +38,6 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.layout.EchoLayout; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; -import ch.qos.logback.core.util.StatusPrinter; public class TimeBasedRollingWithArchiveRemovalTest { ----------------------------------------------------------------------- Summary of changes: .../test/java/ch/qos/logback/classic/HLogger.java | 2 - .../classic/boolex/JaninoEventEvaluatorTest.java | 1 - .../classic/control/ControlLoggerContext.java | 1 - .../qos/logback/classic/control/ScenarioMaker.java | 1 - ...aultTimeBasedFileNamingAndTriggeringPolicy.java | 2 +- .../core/rolling/SizeAndTimeBasedFNATP.java | 2 +- .../TimeBasedFileNamingAndTriggeringPolicy.java | 7 ++- ...TimeBasedFileNamingAndTriggeringPolicyBase.java | 43 ++++++++++--------- .../core/rolling/SizeAndTimeBasedFNATP_Test.java | 6 +- .../logback/core/rolling/TimeBasedRollingTest.java | 36 ++++++++++------- .../TimeBasedRollingWithArchiveRemovalTest.java | 2 +- 11 files changed, 54 insertions(+), 49 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 21b667f88d347ecacf1cb3ef60d159a3eba71d89
by git-noreply＠pixie.qos.ch 02 Dec '09

02 Dec '09

The branch, master has been updated via 21b667f88d347ecacf1cb3ef60d159a3eba71d89 (commit) from d106f950fee98979df8f92537f47d5aea361b869 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=21b667f88d347ecacf1cb3ef… http://github.com/ceki/logback/commit/21b667f88d347ecacf1cb3ef60d159a3eba71… commit 21b667f88d347ecacf1cb3ef60d159a3eba71d89 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Dec 3 11:08:28 2009 +0100 - investigating lbcore26 diff --git a/logback-classic/src/test/input/issue/lbcore26.xml b/logback-classic/src/test/input/issue/lbcore26.xml new file mode 100644 index 0000000..ac56c83 --- /dev/null +++ b/logback-classic/src/test/input/issue/lbcore26.xml @@ -0,0 +1,18 @@ +<configuration scan="true"> + <appender name="LOG" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>target/test-output/lbcore26.log </file> + + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <FileNamePattern>target/test-output/lbcore26.%d{yyyy-MM-dd}.log</FileNamePattern> + <MaxHistory>30</MaxHistory> + </rollingPolicy> + + <layout> + <Pattern>%date [%thread] %-5level %logger - %msg%n</Pattern> + </layout> + </appender> + + <root level="info"> + <appender-ref ref="LOG" /> + </root> +</configuration> \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java index 9e9e249..8bf96f0 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java @@ -18,5 +18,6 @@ public class ClassicTestConstants { final static public String ISO_REGEX = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}"; final static public String NAKED_MAIN_REGEX = "[mM]ain(\\sThread)?"; final static public String MAIN_REGEX = "\\["+NAKED_MAIN_REGEX+"\\]"; - final static public String JORAN_INPUT_PREFIX = "src/test/input/joran"; + final static public String INPUT_PREFIX = "src/test/input/"; + final static public String JORAN_INPUT_PREFIX = INPUT_PREFIX+"joran/"; } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore26/Main.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore26/Main.java new file mode 100644 index 0000000..d4e746b --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore26/Main.java @@ -0,0 +1,32 @@ +package ch.qos.logback.classic.issue.lbcore26; + +import java.util.Date; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; + +public class Main { + + public static void main(String[] args) throws JoranException { + + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure(ClassicTestConstants.INPUT_PREFIX + + "issue/lbcore26.xml"); + + StatusPrinter.printInCaseOfErrorsOrWarnings(lc); + Logger logger = LoggerFactory.getLogger(Main.class); + for (int i = 0; i < 16; i++) { + logger.info("hello " + new Date()); + } + + } + +} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java index f6766dc..fe464de 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java @@ -151,7 +151,7 @@ public class SyslogAppenderTest { configurator.setContext(lc); lc.reset(); configurator.doConfigure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "/syslog_LBCLASSIC_50.xml"); + + "syslog_LBCLASSIC_50.xml"); org.slf4j.Logger logger = LoggerFactory.getLogger(this.getClass()); logger.info("hello"); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java index 67bad61..3322ae8 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java @@ -66,7 +66,7 @@ public class TimeBasedRollingWithConfigFileTest extends public void basic() throws Exception { String testId = "basic"; lc.putProperty("testId", testId); - loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/rolling/" + testId + loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "rolling/" + testId + ".xml"); StatusChecker sc = new StatusChecker(lc); assertTrue(sc.isErrorFree()); @@ -107,7 +107,7 @@ public class TimeBasedRollingWithConfigFileTest extends int approxWritesPerPeriod = 64; sizeThreshold = prefix.length() * approxWritesPerPeriod; lc.putProperty("sizeThreshold", "" + sizeThreshold); - loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/rolling/" + testId + loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "rolling/" + testId + ".xml"); Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java index c7f393d..38bec98 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java @@ -50,7 +50,7 @@ public class UniqueFileTest { @Test public void basic() throws Exception { - loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/unique.xml"); + loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "unique.xml"); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss"); String timestamp = sdf.format(new Date()); diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java index ef19d9d..8c5a761 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java @@ -26,8 +26,6 @@ import ch.qos.logback.core.rolling.helper.DefaultArchiveRemover; */ public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedFileNamingAndTriggeringPolicyBase<E> { - - @Override public void start() { super.start(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java index c912718..30b5c9c 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java @@ -261,6 +261,9 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { rfa1.stop(); + + System.out.println("time before wait "+SDF.format(new Date(currentTime))); + long fileTimestamp = currentTime; incCurrentTime(2000); @@ -268,6 +271,7 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests { initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" + DATE_PATTERN_WITH_SECONDS + "}", currentTime, fileTimestamp); + System.out.println("time after wait "+SDF.format(new Date(currentTime))); for (int i = 0; i <= 2; i++) { rfa2.doAppend("World---" + i); addExpectedFileNamedIfItsTime_ByDate(testId, false); ----------------------------------------------------------------------- Summary of changes: logback-classic/src/test/input/issue/lbcore26.xml | 18 +++++++++++ .../qos/logback/classic/ClassicTestConstants.java | 3 +- .../qos/logback/classic/issue/lbcore26/Main.java | 32 ++++++++++++++++++++ .../logback/classic/net/SyslogAppenderTest.java | 2 +- .../TimeBasedRollingWithConfigFileTest.java | 4 +- .../logback/classic/rolling/UniqueFileTest.java | 2 +- ...aultTimeBasedFileNamingAndTriggeringPolicy.java | 2 - .../logback/core/rolling/TimeBasedRollingTest.java | 4 ++ 8 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 logback-classic/src/test/input/issue/lbcore26.xml create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore26/Main.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Issue Comment Edited: (LBCORE-26) TimeBasedRollingPolicy append logs into a old log file, instead of rolling the log file.
by Ceki Gulcu (JIRA) 02 Dec '09

02 Dec '09

[ http://jira.qos.ch/browse/LBCORE-26?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu edited comment on LBCORE-26 at 12/2/09 9:51 AM: ----------------------------------------------------------- Apparently this bug has resurfaced. See http://www.qos.ch/pipermail/logback-user/2009-September/001295.html <configuration scan="true"> <appender name="LOG" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>/var/log/zeugma/selectterms/selectterms.log </file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <FileNamePattern>/var/log/zeugma/selectterms/selectterms.%d{yyyy-MM-dd}.log.gz</FileNamePattern> <MaxHistory>30</MaxHistory> </rollingPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%date [%thread] %-5level %logger - %msg%n</Pattern> </layout> </appender> <root level="info"> <appender-ref ref="LOG" /> </root> </configuration> I can confirm that after stop/restart of the applictation, no rollover occurs with the above config file. was (Author: noreply.ceki(a)qos.ch) Apparently this bug has resurfaced. See http://www.qos.ch/pipermail/logback-user/2009-September/001295.html <configuration scan="true"> <appender name="LOG" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>/var/log/zeugma/selectterms/selectterms.log </file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <FileNamePattern>/var/log/zeugma/selectterms/selectterms.%d{yyyy-MM-dd}.log.gz</FileNamePattern> <MaxHistory>30</MaxHistory> </rollingPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%date [%thread] %-5level %logger - %msg%n</Pattern> </layout> </appender> <root level="info"> <appender-ref ref="LOG" /> </root> </configuration> > TimeBasedRollingPolicy append logs into a old log file, instead of rolling the log file. > ---------------------------------------------------------------------------------------- > > Key: LBCORE-26 > URL: http://jira.qos.ch/browse/LBCORE-26 > Project: logback-core > Issue Type: Bug > Components: Rolling > Affects Versions: unspecified > Environment: Operating System: All > Platform: All > Reporter: Tsutomu YANO > Assignee: Ceki Gulcu > Priority: Critical > Fix For: 0.9.12 > > > If you use TimeBasedRollingPolicy to rollover a log file and no log wasn't wrote into the log beyond the timing of rollover, and if you restart your application, the log file doesn't roll, then new log will be appended into old log file. > EVIDENCE: > 1. in logback.xml, set your FileNamePattern like 'log.%d{yyyy-MM-dd_HH-mm}.log'. > 2. Simply do a kind of thing, which will make some logs into your log file. > 3. Wait for some minutes. > 4. restart your application. > 5. do a kind of thing, which will make some logs into your log file. > the FileNamePattern is 'log.%d{yyyy-MM-dd_HH-mm}.log', so the log file will be roll every minutes. On case 5 of above example, the log file should be roll over, because some minutes already have passed after last logs wrote into the log file. But the file didn't be roll overed. > THE CAUSE: > In start() method of TimeBasedRollingPolicy, you initialize a variable 'lastCheck' to System.currentTimeStamp(). So if you restart your application, the last check time will be set to just NOW. > you should initialize the variable to a last modified time of a current log file. > See below source code. from '//modified by Tsutomu YANO' to '//until here'. > SOURCE: > public void start() { > // set the LR for our utility object > util.setContext(this.context); > compress.setContext(this.context); > // find out period from the filename pattern > if (fileNamePatternStr != null) { > fileNamePattern = new FileNamePattern(fileNamePatternStr, this.context); > determineCompressionMode(); > } else { > addWarn(FNP_NOT_SET); > addWarn(SEE_FNP_NOT_SET); > throw new IllegalStateException(FNP_NOT_SET + SEE_FNP_NOT_SET); > } > DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); > if (dtc == null) { > throw new IllegalStateException("FileNamePattern [" + fileNamePattern.getPattern() + "] does not contain a valid DateToken"); > } > int len = fileNamePatternStr.length(); > switch (compressionMode) { > case Compress.GZ: > activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring(0, len - 3), this.context); > break; > case Compress.ZIP: > activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring(0, len - 4), this.context); > break; > case Compress.NONE: > activeFileNamePattern = fileNamePattern; > } > addInfo("Will use the pattern " + activeFileNamePattern + " for the active file"); > rc = new RollingCalendar(); > rc.init(dtc.getDatePattern()); > addInfo("The date pattern is '" + dtc.getDatePattern() + "' from file name pattern '" + fileNamePattern.getPattern() + "'."); > rc.printPeriodicity(this); > > //modified by Tsutomu YANO > //if a current log file exists, initialize a 'lastCheck' variable to the > //last modified date of the file. > File currentFile = new File(getParentFileName()); > if(currentFile.exists() && currentFile.canRead()) { > lastCheck.setTime(currentFile.lastModified()); > } else { > // currentTime = System.currentTimeMillis(); > lastCheck.setTime(getCurrentTime()); > } > //until here > > nextCheck = rc.getNextCheckMillis(lastCheck); > // Date nc = new Date(); > // nc.setTime(nextCheck); > } -- 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 0

[JIRA] Created: (LBCORE-122) Joran IncludeAction does not close the input file stream in case of SaxParseException
by Michael Franz (JIRA) 01 Dec '09

01 Dec '09

Joran IncludeAction does not close the input file stream in case of SaxParseException ------------------------------------------------------------------------------------- Key: LBCORE-122 URL: http://jira.qos.ch/browse/LBCORE-122 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.17 Reporter: Michael Franz Assignee: Logback dev list If parsing include file for a Joran configuration fails e.g. with a SaxParseException then the include file stream is not closed immediately. Depending on the operation system fixing the configuration file requires to stop the Java VM or perhaps to run the garbage collector explicitly. >From IncludeAction.java: InputStream in = getInputStream(ec, attributes); try { if (in != null) { parseAndRecord(in, recorder); in.close(); } } catch (JoranException e) { addError("Error while parsing " + attributeInUse, e); } catch (IOException e) { // called if in.close did not work } The in.close() should be called in a finally block, so the the stream is ensured to be closed. -- 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 1

branch, master, updated. d106f950fee98979df8f92537f47d5aea361b869
by git-noreply＠pixie.qos.ch 01 Dec '09

01 Dec '09

The branch, master has been updated via d106f950fee98979df8f92537f47d5aea361b869 (commit) from b228e86a5cee41e0617ba04a8350754a011d491a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=d106f950fee98979df8f9253… http://github.com/ceki/logback/commit/d106f950fee98979df8f92537f47d5aea361b… commit d106f950fee98979df8f92537f47d5aea361b869 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 1 23:30:17 2009 +0100 Fixed http://jira.qos.ch/browse/LBCORE-122 diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java index fc6af03..ffd8528 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java @@ -36,7 +36,6 @@ public class IncludeAction extends Action { private static final String FILE_ATTR = "file"; private static final String URL_ATTR = "url"; private static final String RESOURCE_ATTR = "resource"; - private String attributeInUse; @@ -45,7 +44,7 @@ public class IncludeAction extends Action { throws ActionException { SaxEventRecorder recorder = new SaxEventRecorder(); - + this.attributeInUse = null; if (!checkAttributes(attributes)) { @@ -57,20 +56,27 @@ public class IncludeAction extends Action { try { if (in != null) { parseAndRecord(in, recorder); - in.close(); } } catch (JoranException e) { addError("Error while parsing " + attributeInUse, e); - } catch (IOException e) { - // called if in.close did not work + } finally { + close(in); } - // remove the <included> tag from the beginning and </included> from the end trimHeadAndTail(recorder); - + ec.getJoranInterpreter().addEventsDynamically(recorder.saxEventList); } + void close(InputStream in) { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + } + } + } + private boolean checkAttributes(Attributes attributes) { String fileAttribute = attributes.getValue(FILE_ATTR); String urlAttribute = attributes.getValue(URL_ATTR); @@ -170,13 +176,13 @@ public class IncludeAction extends Action { private void trimHeadAndTail(SaxEventRecorder recorder) { // Let's remove the two <included> events before // adding the events to the player. - + List<SaxEvent> saxEventList = recorder.saxEventList; - + if (saxEventList.size() == 0) { return; } - + SaxEvent first = saxEventList.get(0); if (first != null && first.qName.equalsIgnoreCase(INCLUDED_TAG)) { saxEventList.remove(0); @@ -188,7 +194,8 @@ public class IncludeAction extends Action { } } - private void parseAndRecord(InputStream inputSource, SaxEventRecorder recorder) throws JoranException { + private void parseAndRecord(InputStream inputSource, SaxEventRecorder recorder) + throws JoranException { recorder.setContext(context); recorder.recordEvents(inputSource); } diff --git a/logback-core/src/test/input/joran/inclusion/invalid.xml b/logback-core/src/test/input/joran/inclusion/invalid.xml index 5eaa0b2..0519ecb 100644 --- a/logback-core/src/test/input/joran/inclusion/invalid.xml +++ b/logback-core/src/test/input/joran/inclusion/invalid.xml @@ -1,8 +1 @@ -<included> -  - - <inc increment="1"> - - <inc increment="1"/> - -</included> \ No newline at end of file + \ No newline at end of file diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java index 2979429..c4e1cdf 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java @@ -16,7 +16,11 @@ package ch.qos.logback.core.joran.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.MalformedURLException; import java.net.UnknownHostException; import java.util.HashMap; @@ -34,6 +38,8 @@ import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.status.Status; 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 IncludeActionTest { @@ -68,6 +74,8 @@ public class IncludeActionTest { static final String INCLUDED_AS_RESOURCE = "asResource/joran/inclusion/includedAsResource.xml"; + int diff = RandomUtil.getPositiveInt(); + public IncludeActionTest() { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); @@ -106,7 +114,7 @@ public class IncludeActionTest { verifyConfig(2); } - @Test + @Test public void basicURL() throws JoranException { System.setProperty(INCLUDE_KEY, URL_TO_INCLUDE); tc.doConfigure(TOP_BY_URL); @@ -124,14 +132,35 @@ public class IncludeActionTest { } @Test - public void withCorruptFile() throws JoranException { - System.setProperty(INCLUDE_KEY, INVALID); + public void withCorruptFile() throws JoranException, IOException { + String tmpOut = copyToTemp(INVALID); + System.setProperty(INCLUDE_KEY, tmpOut); tc.doConfigure(TOP_BY_FILE); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); StatusChecker sc = new StatusChecker(context.getStatusManager()); assertTrue(sc.containsException(SAXParseException.class)); + + // we like to erase the temp file in order to see + // if http://jira.qos.ch/browse/LBCORE-122 was fixed + File f = new File(tmpOut); + assertTrue(f.exists()); + assertTrue(f.delete()); + } + String copyToTemp(String in) throws IOException { + FileInputStream fis = new FileInputStream(in); + String out = CoreTestConstants.OUTPUT_DIR_PREFIX+"out"+diff; + FileOutputStream fos = new FileOutputStream(out); + int b; + while((b=fis.read()) != -1) { + fos.write(b); + } + fis.close(); + fos.close(); + return out; + } + @Test public void malformedURL() throws JoranException { System.setProperty(INCLUDE_KEY, "htp://logback.qos.ch"); @@ -169,11 +198,18 @@ public class IncludeActionTest { } @Test + public void saxParseException() throws JoranException { + System.setProperty(INCLUDE_KEY, INCLUDED_FILE); + System.setProperty(SECOND_FILE_KEY, SECOND_FILE); + tc.doConfigure(MULTI_INCLUDE_BY_FILE); + verifyConfig(3); + } + + @Test public void errorInDoBegin() { - + } - - + void verifyConfig(int expected) { assertEquals(expected, IncAction.beginCount); assertEquals(expected, IncAction.endCount); diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 68eb6b0..6dd2dc1 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -48,6 +48,19 @@ as proposed by David Varnes in <a href="http://jira.qos.ch/browse/LBCORE-101">LBCORE-101</a>. + <code>ReconfigureOnChangeFilter</code> did not pick up changes + for configuration files containing spaces. This issue was reported + in <a href="http://jira.qos.ch/browse/LBCORE-119">LBCORE-119</a> + by Anders Wallgren. + + + When ill-formed configuration files fragments were included in + another configuration file, the included file was not closed + correctly. This issue was reported in <a + href="http://jira.qos.ch/browse/LBCORE-122">LBCORE-122</a> by + Michael Franz. + + JaninoEventEvaluator now passes the throwable associated with an event as a <code>java.lang.Throwable</code> instead of an <code>IThrowableProxy</code>. This fixes <a ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/action/IncludeAction.java | 29 +++++++----- .../src/test/input/joran/inclusion/invalid.xml | 9 +--- .../core/joran/action/IncludeActionTest.java | 48 +++++++++++++++++--- logback-site/src/site/pages/news.html | 13 +++++ 4 files changed, 74 insertions(+), 25 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0