Author: ceki Date: Fri Aug 7 23:02:57 2009 New Revision: 2421 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java logback/trunk/logback-site/src/site/pages/news.html Log: - minor changes - added blurb about LBCORE-90 being fixed Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java Fri Aug 7 23:02:57 2009 @@ -11,7 +11,6 @@ import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.rolling.helper.CompressionMode; -import ch.qos.logback.core.rolling.helper.FileFilterUtil; import ch.qos.logback.core.rolling.helper.FileNamePattern; import ch.qos.logback.core.spi.ContextAwareBase; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Fri Aug 7 23:02:57 2009 @@ -174,7 +174,7 @@ rfa.stop(); } - void findAllInFolderRecursively(File dir, List<File> fileList, + void findAllInFolderRecursivelyByStringContains(File dir, List<File> fileList, final String pattern) { if (dir.isDirectory()) { File[] match = dir.listFiles(new FileFilter() { @@ -185,13 +185,13 @@ for (File f : match) { fileList.add(f); if (f.isDirectory()) { - findAllInFolderRecursively(f, fileList, pattern); + findAllInFolderRecursivelyByStringContains(f, fileList, pattern); } } } } - void findFilesInFolderRecursively(File dir, List<File> fileList, + void findFilesInFolderRecursivelyByPatterMatch(File dir, List<File> fileList, final String pattern) { if (dir.isDirectory()) { File[] match = dir.listFiles(new FileFilter() { @@ -201,7 +201,7 @@ }); for (File f : match) { if (f.isDirectory()) { - findFilesInFolderRecursively(f, fileList, pattern); + findFilesInFolderRecursivelyByPatterMatch(f, fileList, pattern); } else { fileList.add(f); } @@ -234,22 +234,17 @@ return (maxHistory + 1) * 2 + slashCount; } - int expectedCountWithDirs_NoSlash(int maxHistory) { - // one file and one directory per archived log file - return (maxHistory + 1) * 2; - } - void check(int expectedCount) { File dir = new File(randomOutputDir); List<File> fileList = new ArrayList<File>(); - findAllInFolderRecursively(dir, fileList, "clean"); + findAllInFolderRecursivelyByStringContains(dir, fileList, "clean"); assertEquals(expectedCount, fileList.size()); } void checkPatternCompliance(int expectedClassCount, String regex) { File dir = new File(randomOutputDir); List<File> fileList = new ArrayList<File>(); - findFilesInFolderRecursively(dir, fileList, regex); + findFilesInFolderRecursivelyByPatterMatch(dir, fileList, regex); System.out.println("regex="+regex); System.out.println("fileList="+fileList); Set<String> set = groupByClass(fileList, regex); Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Fri Aug 7 23:02:57 2009 @@ -44,6 +44,11 @@ truncate mode when an application stops and is quickly re-started, any pre-existing log file for the current period will be lost.</p> + <p>The <code>activeFile</code> field in + <code>RollingFileAppender</code> is now properly updated, fixing + <a href="http://jira.qos.ch/browse/LBCORE-90">LBCORE-90</a> as + reported by Valery Shorin.</p> + <hr width="80%" align="center" /> <h3>15th of July 2009 - Release of version 0.9.16</h3>