From 4218bce0239f4f1a3a49d7934fbd856c72ed4458 Mon Sep 17 00:00:00 2001 From: wodeyangzipingpingwuqi Date: Tue, 29 Oct 2024 14:21:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.1.2.0-beta3):=201=E3=80=81=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E3=80=81=E9=87=8D=E8=AF=95=E4=BB=BB=E5=8A=A1=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E6=97=B6=E9=97=B4=E4=B8=80=E5=B0=8F=E6=97=B6=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=9B=9B=E5=B0=8F=E6=97=B6=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=97=A5=E5=BF=97=E6=B8=85=E9=99=A4BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/schedule/JobClearLogSchedule.java | 16 +++++++--------- .../task/support/schedule/ClearLogSchedule.java | 13 +++++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java index 0bfe28e7..f2985f60 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java @@ -20,8 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallbackWithoutResult; @@ -58,7 +56,7 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public String lockAtMost() { - return "PT1H"; + return "PT4H"; } @Override @@ -69,8 +67,9 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override protected void doExecute() { try { - // 清楚日志默认保存天数大于零、最少保留最近一天的日志数据 - if (systemProperties.getLogStorage() <= 0 || System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + // 清除日志默认保存天数大于零、最少保留最近一天的日志数据 + if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + SnailJobLog.LOCAL.error("job clear log storage error", systemProperties.getLogStorage()); return; } // clean job log @@ -80,11 +79,10 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { this::processJobLogPartitionTasks, 0); SnailJobLog.LOCAL.debug("Job clear success total:[{}]", total); - } catch (Exception e) { - SnailJobLog.LOCAL.error("job clear log error", e); - } finally { // update clean time lastCleanLogTime = System.currentTimeMillis(); + } catch (Exception e) { + SnailJobLog.LOCAL.error("job clear log error", e); } } @@ -146,7 +144,7 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public void start() { - taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H")); + taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT4H")); } @Override diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java index f1b76992..f97fb58d 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java @@ -56,7 +56,7 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public String lockAtMost() { - return "PT1H"; + return "PT4H"; } @Override @@ -67,7 +67,9 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override protected void doExecute() { try { - if (systemProperties.getLogStorage() <= 0 || System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + // 清除日志默认保存天数大于零、最少保留最近一天的日志数据 + if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + SnailJobLog.LOCAL.error("retry clear log storage error", systemProperties.getLogStorage()); return; } // clean retry log @@ -76,11 +78,10 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { this::processRetryLogPartitionTasks, 0); SnailJobLog.LOCAL.debug("Retry clear success total:[{}]", total); - } catch (Exception e) { - SnailJobLog.LOCAL.error("clear log error", e); - } finally { // update clean time lastCleanLogTime = System.currentTimeMillis(); + } catch (Exception e) { + SnailJobLog.LOCAL.error("clear log error", e); } } @@ -137,7 +138,7 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public void start() { - taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H")); + taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT4H")); } @Override