From f267eabbae5c21f29b956b59529739b959cbaf0d Mon Sep 17 00:00:00 2001
From: bokai <Jinbokai@fanruan.com>
Date: Wed, 18 Nov 2020 15:58:29 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-42043=20fanruan.log=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=86=E5=89=B2-=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log4j/DailyRollingFileAppender.java       | 128 +++++++++---------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/fine-log4j/src/main/java/com/fr/third/apache/log4j/DailyRollingFileAppender.java b/fine-log4j/src/main/java/com/fr/third/apache/log4j/DailyRollingFileAppender.java
index e90cca439..8b33443c1 100644
--- a/fine-log4j/src/main/java/com/fr/third/apache/log4j/DailyRollingFileAppender.java
+++ b/fine-log4j/src/main/java/com/fr/third/apache/log4j/DailyRollingFileAppender.java
@@ -302,75 +302,79 @@ public class DailyRollingFileAppender extends FileAppender {
     return TOP_OF_TROUBLE; // Deliberately head for trouble...
   }
 
-  /**
-     Rollover the current file to a new file.
-  */
-  void rollOver() throws IOException {
+    /**
+     * Rollover the current file to a new file.
+     */
+    void rollOver() throws IOException {
 
-    /* Compute filename, but only if datePattern is specified */
-    if (datePattern == null) {
-      errorHandler.error("Missing DatePattern option in rollOver().");
-      return;
-    }
+        /* Compute filename, but only if datePattern is specified */
+        if (datePattern == null) {
+            errorHandler.error("Missing DatePattern option in rollOver().");
+            return;
+        }
 
-    String datedFilename = fileName+sdf.format(now)+COMPRESS_SUFFIX;
-    // It is too early to roll over because we are still within the
-    // bounds of the current interval. Rollover will occur once the
-    // next interval is reached.
-      if (scheduledFilename.equals(datedFilename)) {
-          return;
-      }
-      synchronized (this) {
-          if (scheduledFilename.equals(datedFilename)) {
-              return;
-          }
+        String datedFilename = fileName + sdf.format(now) + COMPRESS_SUFFIX;
+        // It is too early to roll over because we are still within the
+        // bounds of the current interval. Rollover will occur once the
+        // next interval is reached.
+        if (scheduledFilename.equals(datedFilename)) {
+            return;
+        }
 
-          // close current file, and compress it to datedFilename
-          this.closeFile();
+        // close current file, and compress it to datedFilename
+        this.closeFile();
 
-          File target = new File(scheduledFilename);
-          if (target.exists()) {
-              target.delete();
-          }
+        File target = new File(scheduledFilename);
+        if (target.exists()) {
+            target.delete();
+        }
 
-          File file = new File(fileName);
-          boolean result = false;
-
-          try (FileInputStream fis =new FileInputStream(file) ;
-          FileOutputStream fos = new FileOutputStream(target);
-          GZIPOutputStream gzos = new GZIPOutputStream(fos);){
-              byte[] inbuf = new byte[8102];
-              int n;
-
-              while ((n = fis.read(inbuf)) != -1) {
-                  gzos.write(inbuf, 0, n);
-              }
-              result = true;
-          } catch (Exception e) {
-              LogLog.error("Compress " + fileName + " to " + scheduledFilename + " failed.");
-              LogLog.error(e.getMessage(), e);
-          }
+        File file = new File(fileName);
+        boolean result = false;
 
-          if (result) {
-              if (!file.delete()) {
-                  LogLog.debug("file delete failed, empty it.");
-                  emptyFile(file);
-              }
-              LogLog.debug(fileName + " -> " + scheduledFilename);
-          } else {
-              LogLog.error("Failed to rename [" + fileName + "] to [" + scheduledFilename + "].");
-          }
+        try (FileInputStream fis = new FileInputStream(file);
+             FileOutputStream fos = new FileOutputStream(target);
+             GZIPOutputStream gzos = new GZIPOutputStream(fos);) {
+            byte[] inbuf = new byte[8102];
+            int n;
 
-          try {
-              // This will also close the file. This is OK since multiple
-              // close operations are safe.
-              this.setFile(fileName, true, this.bufferedIO, this.bufferSize);
-          } catch (IOException e) {
-              errorHandler.error("setFile(" + fileName + ", true) call failed.");
-          }
-          scheduledFilename = datedFilename;
-      }
-  }
+            while ((n = fis.read(inbuf)) != -1) {
+                gzos.write(inbuf, 0, n);
+            }
+            result = true;
+        } catch (Exception e) {
+            LogLog.error("Compress " + fileName + " to " + scheduledFilename + " failed.");
+            LogLog.error(e.getMessage(), e);
+        }
+
+        boolean isDeleteSuccess = true;
+        if (result) {
+            isDeleteSuccess = file.delete();
+            LogLog.debug(fileName + " -> " + scheduledFilename);
+        } else {
+            LogLog.error("Failed to rename [" + fileName + "] to [" + scheduledFilename + "].");
+        }
+
+        try {
+            // This will also close the file. This is OK since multiple
+            // close operations are safe.
+            this.setFile(fileName, true, this.bufferedIO, this.bufferSize);
+        } catch (IOException e) {
+            errorHandler.error("setFile(" + fileName + ", true) call failed.");
+        }
+        if(!isDeleteSuccess){
+            synchronized (this) {
+                if (scheduledFilename.equals(datedFilename)) {
+                    return;
+                }
+                LogLog.debug("file delete failed, empty it.");
+                emptyFile(file);
+                scheduledFilename = datedFilename;
+            }
+        }else {
+            scheduledFilename = datedFilename;
+        }
+    }
 
 
     /**