1.修改日志滚动策略逻辑:

  1.1: TimedRollingFileAppender新增方法 resetTimedRollingFilleConfig(String datePattern),可根据日志滚动策略对日志进行动态配置
  1.2: LoadTestAwareAppender 新增rest方法,根据日期策略重置nonLoadTestTraceAppender和loadTestTraceAppender

Author: 淼淼

tracer-core/src/main/java/com/alipay/common/tracer/core/appender/file/LoadTestAwareAppender.java

@@ -21,68 +21,59 @@
 import java.io.File;
 import java.io.IOException;
 
-/**
- * LoadTestAwareAppender
- *
- * @author yangguanchao
- * @since 2017/06/25
- */
 public final class LoadTestAwareAppender implements TraceAppender {
+    private TimedRollingFileAppender nonLoadTestTraceAppender;
+    private TimedRollingFileAppender loadTestTraceAppender;
 
-    /** TraceAppender for non-pressure */
-    private TraceAppender nonLoadTestTraceAppender;
-    /** TraceAppender for pressure*/
-    private TraceAppender loadTestTraceAppender;
-
-    private LoadTestAwareAppender(TraceAppender nonLoadTestTraceAppender,
-                                  TraceAppender loadTestTraceAppender) {
+    private LoadTestAwareAppender(TimedRollingFileAppender nonLoadTestTraceAppender,
+                                  TimedRollingFileAppender loadTestTraceAppender) {
         this.nonLoadTestTraceAppender = nonLoadTestTraceAppender;
         this.loadTestTraceAppender = loadTestTraceAppender;
     }
 
     public static LoadTestAwareAppender createLoadTestAwareTimedRollingFileAppender(String logName,
                                                                                     boolean append) {
-        TraceAppender nonLoadTestTraceAppender = new TimedRollingFileAppender(logName, append);
-        TraceAppender loadTestTraceAppender = new TimedRollingFileAppender("shadow"
-                                                                           + File.separator
-                                                                           + logName, append);
+        TimedRollingFileAppender nonLoadTestTraceAppender = new TimedRollingFileAppender(logName,
+            append);
+        TimedRollingFileAppender loadTestTraceAppender = new TimedRollingFileAppender(
+            "shadow" + File.separator + logName, append);
         return new LoadTestAwareAppender(nonLoadTestTraceAppender, loadTestTraceAppender);
     }
 
     public static LoadTestAwareAppender createLoadTestAwareTimedRollingFileAppender(String logName,
                                                                                     String rollingPolicy,
                                                                                     String logReserveConfig) {
-        TraceAppender nonLoadTestTraceAppender = new TimedRollingFileAppender(logName,
-            rollingPolicy, logReserveConfig);
-        TraceAppender loadTestTraceAppender = new TimedRollingFileAppender("shadow"
-                                                                           + File.separator
-                                                                           + logName,
+        TimedRollingFileAppender nonLoadTestTraceAppender = new TimedRollingFileAppender(logName,
             rollingPolicy, logReserveConfig);
+        TimedRollingFileAppender loadTestTraceAppender = new TimedRollingFileAppender(
+            "shadow" + File.separator + logName, rollingPolicy, logReserveConfig);
         return new LoadTestAwareAppender(nonLoadTestTraceAppender, loadTestTraceAppender);
     }
 
     public void append(String log, boolean loadTest) throws IOException {
         if (loadTest) {
-            loadTestTraceAppender.append(log);
+            this.loadTestTraceAppender.append(log);
         } else {
-            nonLoadTestTraceAppender.append(log);
+            this.nonLoadTestTraceAppender.append(log);
         }
     }
 
-    @Override
     public void flush() throws IOException {
-        nonLoadTestTraceAppender.flush();
-        loadTestTraceAppender.flush();
+        this.nonLoadTestTraceAppender.flush();
+        this.loadTestTraceAppender.flush();
     }
 
-    @Override
     public void append(String log) throws IOException {
         throw new UnsupportedOperationException();
     }
 
-    @Override
     public void cleanup() {
-        nonLoadTestTraceAppender.cleanup();
-        loadTestTraceAppender.cleanup();
+        this.nonLoadTestTraceAppender.cleanup();
+        this.loadTestTraceAppender.cleanup();
+    }
+
+    public void reset(String datePattern) {
+        nonLoadTestTraceAppender.resetTimedRollingFilleConfig(datePattern);
+        loadTestTraceAppender.resetTimedRollingFilleConfig(datePattern);
     }
-}
+}

tracer-core/src/main/java/com/alipay/common/tracer/core/appender/file/TimedRollingFileAppender.java

@@ -131,6 +131,17 @@ public TimedRollingFileAppender(String file, int bufferSize, boolean append,
         TracerDaemon.watch(this);
     }
 
+    public void resetTimedRollingFilleConfig(String datePattern) {
+        this.datePattern = datePattern;
+        sdf = new SimpleDateFormat(this.datePattern);
+        rc.setType(computeCheckPeriod());
+        scheduledFilename = fileName + sdf.format(new Date(logFile.lastModified()));
+        TracerDaemon.watch(this);
+        //重置 nextCheck
+        now.setTime(System.currentTimeMillis());
+        this.nextCheck = rc.getNextCheckMillis(now);
+    }
+
     /**
      * Determine if RollOver should be done now
      * @return true:Now RollOver