Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
059e911
1.修改日志滚动策略逻辑:
Jul 4, 2024
d2ef931
Merge branch 'master' into update-log-rolling
zhenjunMa Jul 4, 2024
dba75b1
1.还原注释
Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions ...core/src/main/java/com/alipay/common/tracer/core/appender/file/LoadTestAwareAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,34 +30,32 @@
public final class LoadTestAwareAppender implements TraceAppender {

/** TraceAppender for non-pressure */
private TraceAppender nonLoadTestTraceAppender;
private TimedRollingFileAppender nonLoadTestTraceAppender;
/** TraceAppender for pressure*/
private TraceAppender loadTestTraceAppender;
private TimedRollingFileAppender loadTestTraceAppender;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

把注释都加回来

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

注释还原了


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,
rollingPolicy, logReserveConfig);
TimedRollingFileAppender nonLoadTestTraceAppender = new TimedRollingFileAppender(logName,
rollingPolicy, logReserveConfig);
TimedRollingFileAppender loadTestTraceAppender = new TimedRollingFileAppender(
"shadow" + File.separator + logName, rollingPolicy, logReserveConfig);
return new LoadTestAwareAppender(nonLoadTestTraceAppender, loadTestTraceAppender);
}

Expand Down Expand Up @@ -85,4 +83,9 @@ public void cleanup() {
nonLoadTestTraceAppender.cleanup();
loadTestTraceAppender.cleanup();
}
}

public void reset(String datePattern) {
nonLoadTestTraceAppender.resetTimedRollingFilleConfig(datePattern);
loadTestTraceAppender.resetTimedRollingFilleConfig(datePattern);
}
}
11 changes: 11 additions & 0 deletions ...e/src/main/java/com/alipay/common/tracer/core/appender/file/TimedRollingFileAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down