GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(1.1.2.0-beta3):

Browse Source 
1、修复定时、重试日志清除BUG
2、删除定时、重试保留最近24小时日志数据判断
This commit is contained in:
wodeyangzipingpingwuqi 2024-10-30 09:47:40 +08:00
parent d17500bdd4
commit e5223b7e5b
4 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java
View File

@ -41,8 +41,6 @@ import java.util.List;
@RequiredArgsConstructor
public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle {
// last clean log time
private static Long lastCleanLogTime = 0L;
private final SystemProperties systemProperties;
private final JobTaskBatchMapper jobTaskBatchMapper;
private final JobTaskMapper jobTaskMapper;
@ -68,7 +66,7 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle {
protected void doExecute() {
try {
// 清除日志默认保存天数大于零、最少保留最近一天的日志数据
if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) {
if (systemProperties.getLogStorage() <= 1) {
SnailJobLog.LOCAL.error("job clear log storage error", systemProperties.getLogStorage());
return;
}
@ -79,8 +77,6 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle {
this::processJobLogPartitionTasks, 0);
SnailJobLog.LOCAL.debug("Job clear success total:[{}]", total);
// update clean time
lastCleanLogTime = System.currentTimeMillis();
} catch (Exception e) {
SnailJobLog.LOCAL.error("job clear log error", e);
}

11
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java
View File

@ -53,8 +53,6 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
private final JobLogMessageMapper jobLogMessageMapper;
private final TransactionTemplate transactionTemplate;
// last merge log time
private static Long lastMergeLogTime = 0L;
@Override
public String lockName() {
@ -74,10 +72,6 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
@Override
protected void doExecute() {
try {
// 合并日志数据最少保留最近一天的日志数据
if (System.currentTimeMillis() - lastMergeLogTime < 24 * 60 * 60 * 1000) {
return;
}
// merge job log
long total;
LocalDateTime endTime = LocalDateTime.now().minusDays(systemProperties.getMergeLogDays());
@ -87,9 +81,6 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
SnailJobLog.LOCAL.debug("job merge success total:[{}]", total);
} catch (Exception e) {
SnailJobLog.LOCAL.error("job merge log error", e);
} finally {
// update merge time
lastMergeLogTime = System.currentTimeMillis();
}
}
@ -192,7 +183,7 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
@Override
public void start() {
taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H"));
taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1M"));
}
@Override

6
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java
View File

@ -38,8 +38,6 @@ import java.util.List;
@Slf4j
public class ClearLogSchedule extends AbstractSchedule implements Lifecycle {
// last clean log time
private static Long lastCleanLogTime = 0L;
@Autowired
private RetryTaskLogMapper retryTaskLogMapper;
@Autowired
@ -68,7 +66,7 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle {
protected void doExecute() {
try {
// 清除日志默认保存天数大于零、最少保留最近一天的日志数据
if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) {
if (systemProperties.getLogStorage() <= 1) {
SnailJobLog.LOCAL.error("retry clear log storage error", systemProperties.getLogStorage());
return;
}
@ -78,8 +76,6 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle {
this::processRetryLogPartitionTasks, 0);
SnailJobLog.LOCAL.debug("Retry clear success total:[{}]", total);
// update clean time
lastCleanLogTime = System.currentTimeMillis();
} catch (Exception e) {
SnailJobLog.LOCAL.error("clear log error", e);
}

9
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java
View File

@ -49,8 +49,6 @@ import static java.util.stream.Collectors.toList;
@RequiredArgsConstructor
public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle {
// last merge log time
private static Long lastMergeLogTime = 0L;
private final SystemProperties systemProperties;
private final RetryTaskLogMapper retryTaskLogMapper;
private final RetryTaskLogMessageMapper retryTaskLogMessageMapper;
@ -74,10 +72,6 @@ public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle
@Override
protected void doExecute() {
try {
// 合并日志数据最少保留最近一天的日志数据
if (System.currentTimeMillis() - lastMergeLogTime < 24 * 60 * 60 * 1000) {
return;
}
// merge job log
long total;
LocalDateTime endTime = LocalDateTime.now().minusDays(systemProperties.getMergeLogDays());
@ -87,9 +81,6 @@ public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle
SnailJobLog.LOCAL.debug("job merge success total:[{}]", total);
} catch (Exception e) {
SnailJobLog.LOCAL.error("job merge log error", e);
} finally {
// update merge time
lastMergeLogTime = System.currentTimeMillis();
}
}