Merge pull request #232 from wuwen5/LOGBACK-894

Fix for LOGBACK-894 cleanByPeriodOffset add time check
qos-ch · Jan 10, 2015 · a9ca410 · ceki · Jan 12, 2015 · a9ca410
2 parents 47b0a1f + eb501c5
commit a9ca410
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/...core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java b/...core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java
@@ -39,7 +39,12 @@ public void cleanByPeriodOffset(Date now, int periodOffset) {
         parentDir, stemRegex);
 
     for (File f : matchingFileArray) {
-      f.delete();
+      Date fileLastModified = rc.getRelativeDate(new Date(f.lastModified()), -1);
+
+      if (fileLastModified.compareTo(dateOfPeriodToClean) <= 0) {
+        addInfo("deleting " + f);
+        f.delete();
+      }
     }
 
     if (parentClean) {

diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
@@ -28,11 +28,17 @@ protected void cleanByPeriodOffset(Date now, int periodOffset) {
     String filename = fileNamePattern.convert(date2delete);
     File file2Delete = new File(filename);
     if (file2Delete.exists() && file2Delete.isFile()) {
-      file2Delete.delete();
-      addInfo("deleting " + file2Delete);
-      if (parentClean) {
-        removeFolderIfEmpty(file2Delete.getParentFile());
+      Date fileLastModified = rc.getRelativeDate(new Date(file2Delete.lastModified()), -1);
+
+      if (fileLastModified.compareTo(date2delete) <= 0) {
+        addInfo("deleting " + file2Delete);
+        file2Delete.delete();
+
+        if (parentClean) {
+          removeFolderIfEmpty(file2Delete.getParentFile());
+        }
       }
+
     }
   }
 

diff --git a/...re/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java b/...re/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java
@@ -224,6 +224,31 @@ public void cleanHistoryOnStart() {
     check(expectedCountWithoutFolders(maxHistory));
   }
 
+  @Test
+  public void cleanHistoryOnStartWithDayPattern() {
+    long now = this.currentTime;
+    String fileNamePattern = randomOutputDir + "clean-%d{dd}.txt";
+    int maxHistory = 3;
+    for (int i = 0; i <= 5; i++) {
+      logOncePeriod(now, fileNamePattern, maxHistory);
+      now = now + MILLIS_IN_DAY;
+    }
+    StatusPrinter.print(context);
+    check(expectedCountWithoutFolders(maxHistory));
+  }
+
+  @Test
+  public void cleanHistoryOnStartWithHourPattern() {
+    long now = this.currentTime;
+    String fileNamePattern = randomOutputDir + "clean-%d{HH}.txt";
+    int maxHistory = 3;
+    for (int i = 0; i <= 5; i++) {
+      logOncePeriod(now, fileNamePattern, maxHistory);
+      now = now + MILLIS_IN_HOUR;
+    }
+    StatusPrinter.print(context);
+    check(expectedCountWithoutFolders(maxHistory));
+  }
 
   int expectedCountWithoutFolders(int maxHistory) {
     return maxHistory + 1;