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 e23b4bb85..7b4088fa0 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 @@ -24,6 +24,7 @@ import com.fr.third.apache.log4j.spi.LoggingEvent; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FileWriter; import java.io.IOException; import java.io.InterruptedIOException; import java.text.SimpleDateFormat; @@ -301,79 +302,95 @@ 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; - } + 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; - - FileInputStream fis = null; - FileOutputStream fos = null; - GZIPOutputStream gzos = null; - try { - fis = new FileInputStream(file); - fos = new FileOutputStream(target); - gzos = new GZIPOutputStream(fos); - byte[] inbuf = new byte[8102]; - int n; - - while ((n = fis.read(inbuf)) != -1) { - gzos.write(inbuf, 0, n); + File file = new File(fileName); + boolean isGzipSuccess = 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); + } + isGzipSuccess = true; + } catch (Exception e) { + LogLog.error("Compress " + fileName + " to " + scheduledFilename + " failed."); + LogLog.error(e.getMessage(), e); } - result = true; - } catch (Exception e){ - LogLog.error("Compress " + fileName + " to " + scheduledFilename + " failed."); - LogLog.error(e.getMessage(), e); - } finally { - if(gzos!=null) { - gzos.close(); + + boolean isDeleteSuccess = true; + if (isGzipSuccess) { + 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 (fis != null) { - fis.close(); + if(!isDeleteSuccess){ + synchronized (this) { + if (scheduledFilename.equals(datedFilename)) { + return; + } + LogLog.debug("file delete failed, empty it."); + emptyFile(file); + scheduledFilename = datedFilename; + } + }else { + scheduledFilename = datedFilename; } } - if(result) { - 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."); + /** + * @param file empty file + */ + private static void emptyFile(File file) { + try(FileWriter fileWriter = new FileWriter(file)) { + if (!file.exists()) { + file.createNewFile(); + } + fileWriter.write(""); + fileWriter.flush(); + } catch (IOException e) { + LogLog.debug("empty file failed:" + e.getMessage() + e); + } } - scheduledFilename = datedFilename; - } /** * This method differentiates DailyRollingFileAppender from its