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 0bfe28e76..f2985f606 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 f1b769929..f97fb58d2 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