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

[JIRA] Created: (LBCORE-111) Support for crolonog type rolling
by Ceki Gulcu (JIRA) 09 Aug '09

09 Aug '09

Support for crolonog type rolling --------------------------------- Key: LBCORE-111 URL: http://jira.qos.ch/browse/LBCORE-111 Project: logback-core Issue Type: Improvement Components: Appender Reporter: Ceki Gulcu Assignee: Ceki Gulcu Add support for cronolog type logging file separation. For example: TransferLog "|/usr/sbin/cronolog /web/logs/%Y/%m/%d/access.log" ErrorLog "|/usr/sbin/cronolog /web/logs/%Y/%m/%d/errors.log" This allows each log file to be separated by year, month, etc. See http://cronolog.org/features.html for details. Interestingly enough, TimeBasedRollingPolicy already supports this feature. It's just not tested nor documented. -- 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 2

[JIRA] Created: (LBCORE-76) Joran patterns should be case insensitive
by Ceki Gulcu (JIRA) 09 Aug '09

09 Aug '09

Joran patterns should be case insensitive ----------------------------------------- Key: LBCORE-76 URL: http://jira.qos.ch/browse/LBCORE-76 Project: logback-core Issue Type: Improvement Components: Joran Affects Versions: 0.9.12 Reporter: Ceki Gulcu Assignee: Logback dev list At present time, joran patterns are case sensitive. However, implicit actions are case insensitive. For coherence, joran patterns should be case insensitive. -- 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

[JIRA] Created: (LBCORE-61) TimeBasedRollingPolicy can not be used with any other triggering policies
by Szel Zoltan (JIRA) 07 Aug '09

07 Aug '09

TimeBasedRollingPolicy can not be used with any other triggering policies ------------------------------------------------------------------------- Key: LBCORE-61 URL: http://jira.qos.ch/browse/LBCORE-61 Project: logback-core Issue Type: Bug Reporter: Szel Zoltan Assignee: Logback dev list Priority: Critical If someone would like to have a time based rolling policy with a size based triggering policy, than the user will get a NullPointerException,: at ch.qos.logback.core.rolling.helper.Compress.GZCompress(Compress.java:130) at ch.qos.logback.core.rolling.TimeBasedRollingPolicy.rollover(TimeBasedRollingPolicy.java:142) at ch.qos.logback.core.rolling.RollingFileAppender.rollover(RollingFileAppender.java:91) at ch.qos.logback.core.rolling.RollingFileAppender.subAppend(RollingFileAppender.java:116) at ch.qos.logback.core.WriterAppender.append(WriterAppender.java:124) at ch.qos.logback.core.AppenderBase.doAppend(AppenderBase.java:81) at ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:51) at ch.qos.logback.classic.Logger.appendLoopOnAppenders(Logger.java:282) at ch.qos.logback.classic.Logger.callAppenders(Logger.java:266) at ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:487) at ch.qos.logback.classic.Logger.filterAndLog(Logger.java:479) The cause of this issue is the isTriggeringEvent method in the TimeBasedRollingPolicy which has a side effect, namely it prepares the file name of the file which is about to rotate. If someone uses a triggering policy other than the same TimeBasedRollingPolicy, than the isTriggeringEvent method will not be called, hence the elapsedPeriodFileName will be null, hence a null pointer exception will be thrown in the start of the compression or while renaming. Please modify the isTriggeringEvent to not have this side effect + the rollover logic to capture the time information from the current event. Thanks, Zoltan -- 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 5

[JIRA] Created: (LBCORE-90) RollingFileAppender calls triggeringPolicy.isTriggeringEvent(activeFile, event) with the same activeFile
by Valery Shorin (JIRA) 07 Aug '09

07 Aug '09

RollingFileAppender calls triggeringPolicy.isTriggeringEvent(activeFile, event) with the same activeFile -------------------------------------------------------------------------------------------------------- Key: LBCORE-90 URL: http://jira.qos.ch/browse/LBCORE-90 Project: logback-core Issue Type: Bug Components: Appender Affects Versions: 0.9.14 Reporter: Valery Shorin Assignee: Logback dev list In subAppend(...) method RollingFileAppender calls triggeringPolicy.isTriggeringEvent(activeFile, event) method with activeFileCache variable as first parameter, but activeFileCache variable initialized in start() method of RollingFileAppender and not changed anymore. -- 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 6

Question about a custom binary file appender.
by Joern Huxhorn 02 Aug '09

02 Aug '09

Hi Ceki. I'd like to implement a file appender that writes the binary Lilith format, i.e. gzipped protobuf-serialized events, instead of Strings. I'd also like to have the same functionality that's supported by RollingFileAppender right now. Unfortunately, there seems to be no way to simply write bytes instead of a String. How would you go from here? Reimplementing everything from the start seems to be a pretty bad idea. What do you think about enhancing the RFA so it's using byte[] instead of Strings? The current behavior could be implemented using those methods + string.getBytes("UTF-8") or CharsetEncoder... Any idea, suggestions? Regards, Joern.

3 8

svn commit: r2404 - in logback/trunk/logback-classic/src/test: input/joran/rolling java/ch/qos/logback/classic/rolling
by noreply.ceki＠qos.ch 31 Jul '09

31 Jul '09

Author: ceki Date: Fri Jul 31 23:59:27 2009 New Revision: 2404 Modified: logback/trunk/logback-classic/src/test/input/joran/rolling/timeAndSize.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java Log: - have timeAndSize configuration file driven test pass as well Modified: logback/trunk/logback-classic/src/test/input/joran/rolling/timeAndSize.xml ============================================================================== --- logback/trunk/logback-classic/src/test/input/joran/rolling/timeAndSize.xml (original) +++ logback/trunk/logback-classic/src/test/input/joran/rolling/timeAndSize.xml Fri Jul 31 23:59:27 2009 @@ -10,7 +10,7 @@ </FileNamePattern> <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFileNamingAndTriggeringPolicy"> - <MaxFileSize>20</MaxFileSize> + <MaxFileSize>${sizeThreshold}</MaxFileSize> </TimeBasedFileNamingAndTriggeringPolicy> </rollingPolicy> <layout> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java Fri Jul 31 23:59:27 2009 @@ -19,7 +19,6 @@ import ch.qos.logback.core.rolling.TimeBasedFileNamingAndTriggeringPolicy; import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.util.StatusPrinter; public class TimeBasedRollingWithConfigFileTest extends ScaffoldingForRollingTests { @@ -27,7 +26,7 @@ LoggerContext lc = new LoggerContext(); Logger logger = lc.getLogger(this.getClass()); int fileSize = 0; - int fileIndexCounter = 0; + int fileIndexCounter = -1; int sizeThreshold; @Before @@ -88,15 +87,19 @@ public void timeAndSize() throws Exception { String testId = "timeAndSize"; lc.putProperty("testId", testId); + String prefix = "Hello-----"; + int hits = 64; + sizeThreshold = prefix.length()*hits; + lc.putProperty("sizeThreshold", ""+sizeThreshold); loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/rolling/"+testId+".xml"); Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); + expectedFilenameList.add(randomOutputDir+"z"+testId); RollingFileAppender<ILoggingEvent> rfa = (RollingFileAppender<ILoggingEvent>) root .getAppender("ROLLING"); - StatusPrinter.print(lc); StatusChecker sc = new StatusChecker(lc); assertTrue(sc.isErrorFree()); @@ -107,19 +110,19 @@ - String prefix = "Hello---"; - int runLength = 4; + int timeIncrement = 1000/hits; + int runLength = (1000/timeIncrement)*3; for (int i = 0; i < runLength; i++) { String msg = prefix + i; logger.debug(msg); addExpectedFileNamedIfItsTime(testId, msg, false); - incCurrentTime(500); + incCurrentTime(timeIncrement); tbnatp.setCurrentTime(currentTime); } - System.out.println(expectedFilenameList); - existenceCheck(expectedFilenameList); sortedContentCheck(randomOutputDir, runLength, prefix); + int eCount = existenceCount(expectedFilenameList); + assertTrue("eCount="+eCount+"expectedFilenameList.size="+expectedFilenameList.size(), eCount >= 5 && eCount > expectedFilenameList.size()/2); } @@ -130,7 +133,7 @@ if (passThresholdTime(nextRolloverThreshold)) { fileIndexCounter = 0; fileSize = 0; - addExpectedFileName(testId, getDateOfCurrentPeriodsStart(), + addExpectedFileName(testId, getDateOfPreviousPeriodsStart(), fileIndexCounter, gzExtension); recomputeRolloverThreshold(currentTime); return; @@ -139,9 +142,9 @@ // windows can delay file size changes, so we only allow for // fileIndexCounter 0 and 1 if ((fileIndexCounter < 1) && fileSize > sizeThreshold) { - addExpectedFileName(testId, getDateOfCurrentPeriodsStart(), + addExpectedFileName(testId, getDateOfPreviousPeriodsStart(), ++fileIndexCounter, gzExtension); - fileSize = 0; + fileSize = -1; return; } } @@ -149,8 +152,9 @@ void addExpectedFileName(String testId, Date date, int fileIndexCounter, boolean gzExtension) { - String fn = randomOutputDir + testId + "-" + SDF.format(date) + "-" + String fn = randomOutputDir + testId + "-" + SDF.format(date) + "." + fileIndexCounter; + System.out.println("Adding "+fn); if (gzExtension) { fn += ".gz"; }

1 0

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

31 Jul '09

Author: ceki Date: Fri Jul 31 23:59:18 2009 New Revision: 2403 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java Log: - have timeAndSize configuration file driven test pass as well Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java Fri Jul 31 23:59:18 2009 @@ -30,10 +30,12 @@ public class ScaffoldingForRollingTests { static public final String DATE_PATTERN_WITH_SECONDS = "yyyy-MM-dd_HH_mm_ss"; - static public final SimpleDateFormat SDF = new SimpleDateFormat(DATE_PATTERN_WITH_SECONDS); + static public final SimpleDateFormat SDF = new SimpleDateFormat( + DATE_PATTERN_WITH_SECONDS); int diff = RandomUtil.getPositiveInt(); - protected String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"; + protected String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + + "/"; EchoLayout<Object> layout = new EchoLayout<Object>(); Context context = new ContextBase(); protected List<String> expectedFilenameList = new ArrayList<String>(); @@ -84,23 +86,21 @@ String o2Name = o2.getName(); return (o1Name.compareTo(o2Name)); } - } - ); + }); fileContentCheck(fileArray, runLength, prefix); } public static void reverseSortedContentCheck(String outputDirStr, int runLength, String prefix) throws IOException { File[] fileArray = getFilesInDirectory(outputDirStr); - + Arrays.sort(fileArray, new Comparator<File>() { public int compare(File o1, File o2) { String o1Name = o1.getName(); String o2Name = o2.getName(); return (o2Name.compareTo(o1Name)); } - } - ); + }); System.out.println(Arrays.toString(fileArray)); fileContentCheck(fileArray, runLength, prefix); } @@ -112,6 +112,16 @@ } } + public static int existenceCount(List<String> filenameList) { + int existenceCounter = 0; + for (String filename : filenameList) { + if (new File(filename).exists()) { + existenceCounter++; + } + } + return existenceCounter; + } + String testId2FileName(String testId) { return randomOutputDir + testId + ".log"; } @@ -139,26 +149,27 @@ long delta = currentTime % 1000; return new Date(currentTime - delta - 1000); } - - protected void addExpectedFileName_ByDate(String testId, Date date, boolean gzExtension) { - - String fn = randomOutputDir + testId + "-" - + SDF.format(date); - System.out.println("adding "+fn); + + protected void addExpectedFileName_ByDate(String testId, Date date, + boolean gzExtension) { + + String fn = randomOutputDir + testId + "-" + SDF.format(date); + System.out.println("adding " + fn); if (gzExtension) { fn += ".gz"; - } + } expectedFilenameList.add(fn); } - - protected void addExpectedFileNamedIfItsTime_ByDate(String testId, boolean gzExtension) { + + protected void addExpectedFileNamedIfItsTime_ByDate(String testId, + boolean gzExtension) { if (passThresholdTime(nextRolloverThreshold)) { addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), gzExtension); recomputeRolloverThreshold(currentTime); } } - + String addGZIfNotLast(int i) { int lastIndex = expectedFilenameList.size() - 1; if (i != lastIndex) {

1 0

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

31 Jul '09

Author: ceki Date: Fri Jul 31 21:30:53 2009 New Revision: 2402 Added: logback/trunk/logback-classic/src/test/input/joran/rolling/timeAndSize.xml Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicy.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java Log: on going testing Added: logback/trunk/logback-classic/src/test/input/joran/rolling/timeAndSize.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/rolling/timeAndSize.xml Fri Jul 31 21:30:53 2009 @@ -0,0 +1,26 @@ +<configuration> + + <appender name="ROLLING" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <File>${randomOutputDir}z${testId}</File> + <rollingPolicy + class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <FileNamePattern> + ${randomOutputDir}${testId}-%d{yyyy-MM-dd_HH_mm_ss}.%i + </FileNamePattern> + <TimeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFileNamingAndTriggeringPolicy"> + <MaxFileSize>20</MaxFileSize> + </TimeBasedFileNamingAndTriggeringPolicy> + </rollingPolicy> + <layout> + <Pattern>%msg%n</Pattern> + </layout> + </appender> + + + <root level="debug"> + <appender-ref ref="ROLLING" /> + </root> + +</configuration> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java Fri Jul 31 21:30:53 2009 @@ -1,5 +1,9 @@ package ch.qos.logback.classic.rolling; +import static org.junit.Assert.assertTrue; + +import java.util.Date; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -14,13 +18,18 @@ import ch.qos.logback.core.rolling.ScaffoldingForRollingTests; import ch.qos.logback.core.rolling.TimeBasedFileNamingAndTriggeringPolicy; import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.util.StatusPrinter; public class TimeBasedRollingWithConfigFileTest extends ScaffoldingForRollingTests { LoggerContext lc = new LoggerContext(); Logger logger = lc.getLogger(this.getClass()); - + int fileSize = 0; + int fileIndexCounter = 0; + int sizeThreshold; + @Before @Override public void setUp() { @@ -45,7 +54,10 @@ public void basic() throws Exception { String testId = "basic"; lc.putProperty("testId", testId); - loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/rolling/basic.xml"); + loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/rolling/"+testId+".xml"); + StatusChecker sc = new StatusChecker(lc); + assertTrue(sc.isErrorFree()); + Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); expectedFilenameList.add(randomOutputDir+"z"+testId); @@ -56,7 +68,9 @@ TimeBasedRollingPolicy tprp = (TimeBasedRollingPolicy<ILoggingEvent>) rfa .getTriggeringPolicy(); TimeBasedFileNamingAndTriggeringPolicy tbnatp = tprp.getTimeBasedFileNamingAndTriggeringPolicy(); - + + + String prefix = "Hello---"; int runLength = 4; for (int i = 0; i < runLength; i++) { @@ -70,6 +84,79 @@ sortedContentCheck(randomOutputDir, runLength, prefix); } + @Test + public void timeAndSize() throws Exception { + String testId = "timeAndSize"; + lc.putProperty("testId", testId); + loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/rolling/"+testId+".xml"); + Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); + + expectedFilenameList.add(randomOutputDir+"z"+testId); + + RollingFileAppender<ILoggingEvent> rfa = (RollingFileAppender<ILoggingEvent>) root + .getAppender("ROLLING"); + + StatusPrinter.print(lc); + StatusChecker sc = new StatusChecker(lc); + assertTrue(sc.isErrorFree()); + + + TimeBasedRollingPolicy tprp = (TimeBasedRollingPolicy<ILoggingEvent>) rfa + .getTriggeringPolicy(); + TimeBasedFileNamingAndTriggeringPolicy tbnatp = tprp.getTimeBasedFileNamingAndTriggeringPolicy(); + + + + String prefix = "Hello---"; + int runLength = 4; + for (int i = 0; i < runLength; i++) { + String msg = prefix + i; + logger.debug(msg); + addExpectedFileNamedIfItsTime(testId, msg, false); + incCurrentTime(500); + tbnatp.setCurrentTime(currentTime); + } + + System.out.println(expectedFilenameList); + existenceCheck(expectedFilenameList); + sortedContentCheck(randomOutputDir, runLength, prefix); + } + + + void addExpectedFileNamedIfItsTime(String testId, String msg, + boolean gzExtension) { + fileSize += msg.getBytes().length; + + if (passThresholdTime(nextRolloverThreshold)) { + fileIndexCounter = 0; + fileSize = 0; + addExpectedFileName(testId, getDateOfCurrentPeriodsStart(), + fileIndexCounter, gzExtension); + recomputeRolloverThreshold(currentTime); + return; + } + + // windows can delay file size changes, so we only allow for + // fileIndexCounter 0 and 1 + if ((fileIndexCounter < 1) && fileSize > sizeThreshold) { + addExpectedFileName(testId, getDateOfCurrentPeriodsStart(), + ++fileIndexCounter, gzExtension); + fileSize = 0; + return; + } + } + + void addExpectedFileName(String testId, Date date, int fileIndexCounter, + boolean gzExtension) { + + String fn = randomOutputDir + testId + "-" + SDF.format(date) + "-" + + fileIndexCounter; + if (gzExtension) { + fn += ".gz"; + } + expectedFilenameList.add(fn); + } + @Override protected void addExpectedFileNamedIfItsTime_ByDate(String testId, boolean gzExtension) { if (passThresholdTime(nextRolloverThreshold)) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicy.java Fri Jul 31 21:30:53 2009 @@ -12,8 +12,10 @@ import java.io.File; import java.util.Date; +import ch.qos.logback.core.joran.spi.NoAutoStart; import ch.qos.logback.core.util.FileSize; +@NoAutoStart public class SizeAndTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedFileNamingAndTriggeringPolicyBase<E> { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java Fri Jul 31 21:30:53 2009 @@ -130,7 +130,7 @@ currentTime += increment; } - Date getDateOfCurrentPeriodsStart() { + protected Date getDateOfCurrentPeriodsStart() { long delta = currentTime % 1000; return new Date(currentTime - delta); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java Fri Jul 31 21:30:53 2009 @@ -146,7 +146,6 @@ fileSize = 0; return; } - } void addExpectedFileName(String testId, Date date, int fileIndexCounter,

1 0

svn commit: r2401 - 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 31 Jul '09

31 Jul '09

Author: ceki Date: Fri Jul 31 21:11:53 2009 New Revision: 2401 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.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/TimeBasedFileNamingAndTriggeringPolicyBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Log: Testing configuration file driven TimeBasedRolling Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java Fri Jul 31 21:11:53 2009 @@ -1,8 +1,23 @@ +/** + * 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; import java.io.File; import java.util.Date; +/** + * + * @author Ceki Gülcü + * + * @param <E> + */ public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedFileNamingAndTriggeringPolicyBase<E> { @@ -10,14 +25,12 @@ @Override public void start() { super.start(); - started = true; } public boolean isTriggeringEvent(File activeFile, final E event) { long time = getCurrentTime(); - if (time >= nextCheck) { Date dateOfElapsedPeriod = dateInCurrentPeriod; elapsedPeriodsFileName = tbrp.fileNamePatternWCS 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 Fri Jul 31 21:11:53 2009 @@ -153,7 +153,7 @@ return rollingPolicy; } - public TriggeringPolicy getTriggeringPolicy() { + public TriggeringPolicy<E> getTriggeringPolicy() { return triggeringPolicy; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java Fri Jul 31 21:11:53 2009 @@ -31,9 +31,7 @@ } public void start() { - DateTokenConverter dtc = tbrp.fileNamePattern.getDateTokenConverter(); - if (dtc == null) { throw new IllegalStateException("FileNamePattern [" + tbrp.fileNamePattern.getPattern() Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Fri Jul 31 21:11:53 2009 @@ -84,9 +84,14 @@ } } - public void setTimeBasedTriggering(TimeBasedFileNamingAndTriggeringPolicy<E> timeBasedTriggering) { + public void setTimeBasedFileNamingAndTriggeringPolicy(TimeBasedFileNamingAndTriggeringPolicy<E> timeBasedTriggering) { this.timeBasedTriggering = timeBasedTriggering; } + + public TimeBasedFileNamingAndTriggeringPolicy<E> getTimeBasedFileNamingAndTriggeringPolicy() { + return timeBasedTriggering; + } + static String computeFileNameStr_WCS(String fileNamePatternStr, CompressionMode compressionMode) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java Fri Jul 31 21:11:53 2009 @@ -29,17 +29,17 @@ */ public class ScaffoldingForRollingTests { - static final String DATE_PATTERN_WITH_SECONDS = "yyyy-MM-dd_HH_mm_ss"; - SimpleDateFormat sdf = new SimpleDateFormat(DATE_PATTERN_WITH_SECONDS); + static public final String DATE_PATTERN_WITH_SECONDS = "yyyy-MM-dd_HH_mm_ss"; + static public final SimpleDateFormat SDF = new SimpleDateFormat(DATE_PATTERN_WITH_SECONDS); int diff = RandomUtil.getPositiveInt(); - String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"; + protected String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"; EchoLayout<Object> layout = new EchoLayout<Object>(); Context context = new ContextBase(); - List<String> expectedFilenameList = new ArrayList<String>(); + protected List<String> expectedFilenameList = new ArrayList<String>(); - long nextRolloverThreshold; // initialized in setUp() - long currentTime; // initialized in setUp() + protected long nextRolloverThreshold; // initialized in setUp() + protected long currentTime; // initialized in setUp() Calendar cal = Calendar.getInstance(); public void setUp() { @@ -117,16 +117,16 @@ } // assuming rollover every second - void recomputeRolloverThreshold(long ct) { + protected void recomputeRolloverThreshold(long ct) { long delta = ct % 1000; nextRolloverThreshold = (ct - delta) + 1000; } - boolean passThresholdTime(long nextRolloverThreshold) { + protected boolean passThresholdTime(long nextRolloverThreshold) { return currentTime >= nextRolloverThreshold; } - void incCurrentTime(long increment) { + protected void incCurrentTime(long increment) { currentTime += increment; } @@ -135,6 +135,30 @@ return new Date(currentTime - delta); } + protected Date getDateOfPreviousPeriodsStart() { + long delta = currentTime % 1000; + return new Date(currentTime - delta - 1000); + } + + protected void addExpectedFileName_ByDate(String testId, Date date, boolean gzExtension) { + + String fn = randomOutputDir + testId + "-" + + SDF.format(date); + System.out.println("adding "+fn); + if (gzExtension) { + fn += ".gz"; + } + expectedFilenameList.add(fn); + } + + protected void addExpectedFileNamedIfItsTime_ByDate(String testId, boolean gzExtension) { + if (passThresholdTime(nextRolloverThreshold)) { + addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), + gzExtension); + recomputeRolloverThreshold(currentTime); + } + } + String addGZIfNotLast(int i) { int lastIndex = expectedFilenameList.size() - 1; if (i != lastIndex) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFileNamingAndTriggeringPolicyTest.java Fri Jul 31 21:11:53 2009 @@ -47,7 +47,7 @@ tbrp.setContext(context); satbfnatPolicy.setMaxFileSize("" + sizeThreshold); - tbrp.setTimeBasedTriggering(satbfnatPolicy); + tbrp.setTimeBasedFileNamingAndTriggeringPolicy(satbfnatPolicy); tbrp.setFileNamePattern(filenamePattern); tbrp.setParent(rfa); tbrp.timeBasedTriggering.setCurrentTime(givenTime); @@ -60,7 +60,7 @@ } @Test - public void noCompression_FileBSet_NoRestart_1() throws Exception { + public void noCompression_FileSet_NoRestart_1() throws Exception { String testId = "test1"; String file = randomOutputDir + "toto.log"; initRFA(rfa1, file); @@ -152,7 +152,7 @@ void addExpectedFileName(String testId, Date date, int fileIndexCounter, boolean gzExtension) { - String fn = randomOutputDir + testId + "-" + sdf.format(date) + "-" + String fn = randomOutputDir + testId + "-" + SDF.format(date) + "-" + fileIndexCounter + ".txt"; if (gzExtension) { fn += ".gz"; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Fri Jul 31 21:11:53 2009 @@ -363,23 +363,6 @@ addExpectedFileName_ByFile(file); } - void addExpectedFileName_ByDate(String testId, Date date, boolean gzExtension) { - String fn = randomOutputDir + testId + "-" - + sdf.format(date); - if (gzExtension) { - fn += ".gz"; - } - expectedFilenameList.add(fn); - } - - void addExpectedFileNamedIfItsTime_ByDate(String testId, boolean gzExtension) { - if (passThresholdTime(nextRolloverThreshold)) { - addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), - gzExtension); - recomputeRolloverThreshold(currentTime); - } - } - void addExpectedFileName_ByFile(String filenameSuffix) { String fn = randomOutputDir + filenameSuffix; expectedFilenameList.add(fn);

1 0

svn commit: r2400 - in logback/trunk/logback-classic/src/test: input/joran/rolling java/ch/qos/logback/classic java/ch/qos/logback/classic/rolling
by noreply.ceki＠qos.ch 31 Jul '09

31 Jul '09

Author: ceki Date: Fri Jul 31 21:11:23 2009 New Revision: 2400 Added: logback/trunk/logback-classic/src/test/input/joran/rolling/basic.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java Log: Testing configuration file driven TimeBasedRolling Added: logback/trunk/logback-classic/src/test/input/joran/rolling/basic.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/rolling/basic.xml Fri Jul 31 21:11:23 2009 @@ -0,0 +1,22 @@ +<configuration> + + <appender name="ROLLING" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <File>${randomOutputDir}z${testId}</File> + <rollingPolicy + class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <FileNamePattern> + ${randomOutputDir}${testId}-%d{yyyy-MM-dd_HH_mm_ss} + </FileNamePattern> + </rollingPolicy> + <layout> + <Pattern>%msg%n</Pattern> + </layout> + </appender> + + + <root level="debug"> + <appender-ref ref="ROLLING" /> + </root> + +</configuration> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java Fri Jul 31 21:11:23 2009 @@ -19,6 +19,7 @@ ch.qos.logback.classic.util.PackageTest.class, ch.qos.logback.classic.control.PackageTest.class, ch.qos.logback.classic.joran.PackageTest.class, + ch.qos.logback.classic.rolling.PackageTest.class, ch.qos.logback.classic.jmx.PackageTest.class, ch.qos.logback.classic.boolex.PackageTest.class, ch.qos.logback.classic.selector.PackageTest.class, Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/PackageTest.java Fri Jul 31 21:11:23 2009 @@ -0,0 +1,20 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.rolling; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + + +(a)RunWith(Suite.class) +@SuiteClasses( { TimeBasedRollingWithConfigFileTest.class}) +public class PackageTest { +} \ No newline at end of file Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java Fri Jul 31 21:11:23 2009 @@ -0,0 +1,81 @@ +package ch.qos.logback.classic.rolling; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.rolling.RollingFileAppender; +import ch.qos.logback.core.rolling.ScaffoldingForRollingTests; +import ch.qos.logback.core.rolling.TimeBasedFileNamingAndTriggeringPolicy; +import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; + +public class TimeBasedRollingWithConfigFileTest extends + ScaffoldingForRollingTests { + + LoggerContext lc = new LoggerContext(); + Logger logger = lc.getLogger(this.getClass()); + + @Before + @Override + public void setUp() { + lc.setName("test"); + super.setUp(); + lc.putProperty("randomOutputDir", randomOutputDir); + } + + @After + public void tearDown() throws Exception { + } + + void loadConfig(String confifFile) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(lc); + jc.doConfigure(confifFile); + currentTime = System.currentTimeMillis(); + recomputeRolloverThreshold(currentTime); + } + + @Test + public void basic() throws Exception { + String testId = "basic"; + lc.putProperty("testId", testId); + loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/rolling/basic.xml"); + Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); + + expectedFilenameList.add(randomOutputDir+"z"+testId); + + RollingFileAppender<ILoggingEvent> rfa = (RollingFileAppender<ILoggingEvent>) root + .getAppender("ROLLING"); + + TimeBasedRollingPolicy tprp = (TimeBasedRollingPolicy<ILoggingEvent>) rfa + .getTriggeringPolicy(); + TimeBasedFileNamingAndTriggeringPolicy tbnatp = tprp.getTimeBasedFileNamingAndTriggeringPolicy(); + + String prefix = "Hello---"; + int runLength = 4; + for (int i = 0; i < runLength; i++) { + logger.debug(prefix + i); + addExpectedFileNamedIfItsTime_ByDate(testId, false); + incCurrentTime(500); + tbnatp.setCurrentTime(currentTime); + } + + existenceCheck(expectedFilenameList); + sortedContentCheck(randomOutputDir, runLength, prefix); + } + + @Override + protected void addExpectedFileNamedIfItsTime_ByDate(String testId, boolean gzExtension) { + if (passThresholdTime(nextRolloverThreshold)) { + addExpectedFileName_ByDate(testId, getDateOfPreviousPeriodsStart(), + gzExtension); + recomputeRolloverThreshold(currentTime); + } + } +}

1 0