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

feat: 3.1.1

Browse Source 
1. 修改日志级别
This commit is contained in:
byteblogs168 2024-03-14 22:43:20 +08:00
parent 479d5c5ac5
commit 5361f39942
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java
View File

@ -79,7 +79,7 @@ public class JobExecutorActor extends AbstractActor {
public Receive createReceive() { public Receive createReceive() {
return receiveBuilder().match(TaskExecuteDTO.class, taskExecute -> { return receiveBuilder().match(TaskExecuteDTO.class, taskExecute -> {
try { try {
log.info("准备执行任务. [{}] [{}]", LocalDateTime.now(), JsonUtil.toJsonString(taskExecute)); log.debug("准备执行任务. [{}] [{}]", LocalDateTime.now(), JsonUtil.toJsonString(taskExecute));
transactionTemplate.execute(new TransactionCallbackWithoutResult() { transactionTemplate.execute(new TransactionCallbackWithoutResult() {
@Override @Override
protected void doInTransactionWithoutResult(final TransactionStatus status) { protected void doInTransactionWithoutResult(final TransactionStatus status) {
@ -148,7 +148,7 @@ public class JobExecutorActor extends AbstractActor {
JobExecutor jobExecutor = JobExecutorFactory.getJobExecutor(job.getTaskType()); JobExecutor jobExecutor = JobExecutorFactory.getJobExecutor(job.getTaskType());
jobExecutor.execute(buildJobExecutorContext(taskExecute, job, taskList)); jobExecutor.execute(buildJobExecutorContext(taskExecute, job, taskList));
} finally { } finally {
log.info("准备执行任务完成.[{}]", JsonUtil.toJsonString(taskExecute)); log.debug("准备执行任务完成.[{}]", JsonUtil.toJsonString(taskExecute));
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override @Override
public void afterCompletion(int status) { public void afterCompletion(int status) {
@ -224,7 +224,7 @@ public class JobExecutorActor extends AbstractActor {
// 获取时间差的毫秒数 // 获取时间差的毫秒数
long milliseconds = nextTriggerAt - preTriggerAt; long milliseconds = nextTriggerAt - preTriggerAt;
log.info("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, DateUtils.toNowMilli() % 1000); log.debug("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, DateUtils.toNowMilli() % 1000);
job.setNextTriggerAt(nextTriggerAt); job.setNextTriggerAt(nextTriggerAt);
JobTimerWheel.register(SyetemTaskTypeEnum.JOB.getType(), jobTimerTaskDTO.getTaskBatchId(), timerTask, milliseconds - DateUtils.toNowMilli() % 1000, TimeUnit.MILLISECONDS); JobTimerWheel.register(SyetemTaskTypeEnum.JOB.getType(), jobTimerTaskDTO.getTaskBatchId(), timerTask, milliseconds - DateUtils.toNowMilli() % 1000, TimeUnit.MILLISECONDS);

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java
View File

@ -58,7 +58,7 @@ public class JobExecutorResultActor extends AbstractActor {
@Override @Override
public Receive createReceive() { public Receive createReceive() {
return receiveBuilder().match(JobExecutorResultDTO.class, result -> { return receiveBuilder().match(JobExecutorResultDTO.class, result -> {
log.info("更新任务状态. 参数:[{}]", JsonUtil.toJsonString(result)); log.debug("更新任务状态. 参数:[{}]", JsonUtil.toJsonString(result));
try { try {
JobTask jobTask = new JobTask(); JobTask jobTask = new JobTask();
jobTask.setTaskStatus(result.getTaskStatus()); jobTask.setTaskStatus(result.getTaskStatus());

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java
View File

@ -76,7 +76,7 @@ public class ScanJobTaskActor extends AbstractActor {
long total = PartitionTaskUtils.process(startId -> listAvailableJobs(startId, scanTask), long total = PartitionTaskUtils.process(startId -> listAvailableJobs(startId, scanTask),
this::processJobPartitionTasks, 0); this::processJobPartitionTasks, 0);
log.info("job scan end. total:[{}]", total); log.debug("job scan end. total:[{}]", total);
} }
private void processJobPartitionTasks(List<? extends PartitionTask> partitionTasks) { private void processJobPartitionTasks(List<? extends PartitionTask> partitionTasks) {

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/WorkflowExecutorActor.java
View File

@ -63,7 +63,7 @@ public class WorkflowExecutorActor extends AbstractActor {
@Override @Override
public Receive createReceive() { public Receive createReceive() {
return receiveBuilder().match(WorkflowNodeTaskExecuteDTO.class, taskExecute -> { return receiveBuilder().match(WorkflowNodeTaskExecuteDTO.class, taskExecute -> {
log.info("工作流开始执行. [{}]", JsonUtil.toJsonString(taskExecute)); log.debug("工作流开始执行. [{}]", JsonUtil.toJsonString(taskExecute));
try { try {
doExecutor(taskExecute); doExecutor(taskExecute);
@ -195,14 +195,14 @@ public class WorkflowExecutorActor extends AbstractActor {
List<JobTaskBatch> jobTaskBatches = jobTaskBatchMap.get(nodeId); List<JobTaskBatch> jobTaskBatches = jobTaskBatchMap.get(nodeId);
// 说明此节点未执行, 继续等待执行完成 // 说明此节点未执行, 继续等待执行完成
if (CollectionUtils.isEmpty(jobTaskBatches)) { if (CollectionUtils.isEmpty(jobTaskBatches)) {
EasyRetryLog.LOCAL.info("存在未完成的兄弟节点. [{}]", nodeId); EasyRetryLog.LOCAL.debug("存在未完成的兄弟节点. [{}]", nodeId);
return Boolean.FALSE; return Boolean.FALSE;
} }
boolean isCompleted = jobTaskBatches.stream().anyMatch( boolean isCompleted = jobTaskBatches.stream().anyMatch(
jobTaskBatch -> JobTaskBatchStatusEnum.NOT_COMPLETE.contains(jobTaskBatch.getTaskBatchStatus())); jobTaskBatch -> JobTaskBatchStatusEnum.NOT_COMPLETE.contains(jobTaskBatch.getTaskBatchStatus()));
if (isCompleted) { if (isCompleted) {
EasyRetryLog.LOCAL.info("存在未完成的兄弟节点. [{}]", nodeId); EasyRetryLog.LOCAL.debug("存在未完成的兄弟节点. [{}]", nodeId);
return Boolean.FALSE; return Boolean.FALSE;
} }
} }

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/RunningJobPrepareHandler.java
View File

@ -40,7 +40,7 @@ public class RunningJobPrepareHandler extends AbstractJobPrePareHandler {
@Override @Override
protected void doHandler(JobTaskPrepareDTO prepare) { protected void doHandler(JobTaskPrepareDTO prepare) {
log.info("存在运行中的任务. prepare:[{}]", JsonUtil.toJsonString(prepare)); log.debug("存在运行中的任务. prepare:[{}]", JsonUtil.toJsonString(prepare));
// 若存在所有的任务都是完成，但是批次上的状态为运行中，则是并发导致的未把批次状态变成为终态，此处做一次兜底处理 // 若存在所有的任务都是完成，但是批次上的状态为运行中，则是并发导致的未把批次状态变成为终态，此处做一次兜底处理
int blockStrategy = prepare.getBlockStrategy(); int blockStrategy = prepare.getBlockStrategy();

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java
View File

@ -35,7 +35,7 @@ public class TerminalJobPrepareHandler extends AbstractJobPrePareHandler {
@Override @Override
protected void doHandler(JobTaskPrepareDTO jobPrepareDTO) { protected void doHandler(JobTaskPrepareDTO jobPrepareDTO) {
log.info("无处理中的数据. jobId:[{}]", jobPrepareDTO.getJobId()); log.debug("无处理中的数据. jobId:[{}]", jobPrepareDTO.getJobId());
// 生成任务批次 // 生成任务批次
jobTaskBatchGenerator.generateJobTaskBatch(JobTaskConverter.INSTANCE.toJobTaskGeneratorContext(jobPrepareDTO)); jobTaskBatchGenerator.generateJobTaskBatch(JobTaskConverter.INSTANCE.toJobTaskGeneratorContext(jobPrepareDTO));

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/WaitJobPrepareHandler.java
View File

@ -30,7 +30,7 @@ public class WaitJobPrepareHandler extends AbstractJobPrePareHandler {
@Override @Override
protected void doHandler(JobTaskPrepareDTO jobPrepareDTO) { protected void doHandler(JobTaskPrepareDTO jobPrepareDTO) {
log.info("存在待处理任务. taskBatchId:[{}]", jobPrepareDTO.getTaskBatchId()); log.debug("存在待处理任务. taskBatchId:[{}]", jobPrepareDTO.getTaskBatchId());
// 若时间轮中数据不存在则重新加入 // 若时间轮中数据不存在则重新加入
if (!JobTimerWheel.isExisted(SyetemTaskTypeEnum.JOB.getType(), jobPrepareDTO.getTaskBatchId())) { if (!JobTimerWheel.isExisted(SyetemTaskTypeEnum.JOB.getType(), jobPrepareDTO.getTaskBatchId())) {

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java
View File

@ -41,7 +41,7 @@ public class ReportDispatchResultPostHttpRequestHandler extends PostHttpRequestH
@Override @Override
public String doHandler(String content, UrlQuery query, HttpHeaders headers) { public String doHandler(String content, UrlQuery query, HttpHeaders headers) {
EasyRetryLog.LOCAL.info("Client Callback Request. content:[{}]", content); EasyRetryLog.LOCAL.debug("Client Callback Request. content:[{}]", content);
EasyRetryRequest retryRequest = JsonUtil.parseObject(content, EasyRetryRequest.class); EasyRetryRequest retryRequest = JsonUtil.parseObject(content, EasyRetryRequest.class);
Object[] args = retryRequest.getArgs(); Object[] args = retryRequest.getArgs();

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java
View File

@ -25,7 +25,7 @@ public class JobTimerTask implements TimerTask {
@Override @Override
public void run(final Timeout timeout) throws Exception { public void run(final Timeout timeout) throws Exception {
// 执行任务调度 // 执行任务调度
log.info("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), jobTimerTaskDTO.getTaskBatchId()); log.debug("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), jobTimerTaskDTO.getTaskBatchId());
try { try {
TaskExecuteDTO taskExecuteDTO = new TaskExecuteDTO(); TaskExecuteDTO taskExecuteDTO = new TaskExecuteDTO();

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheel.java
View File

@ -44,7 +44,7 @@ public class JobTimerWheel implements Lifecycle {
public static void register(Integer taskType, Long uniqueId, TimerTask task, long delay, TimeUnit unit) { public static void register(Integer taskType, Long uniqueId, TimerTask task, long delay, TimeUnit unit) {
if (!isExisted(taskType, uniqueId)) { if (!isExisted(taskType, uniqueId)) {
log.info("加入时间轮. delay:[{}ms] taskType:[{}] uniqueId:[{}]", delay, taskType, uniqueId); log.debug("加入时间轮. delay:[{}ms] taskType:[{}] uniqueId:[{}]", delay, taskType, uniqueId);
delay = delay < 0 ? 0 : delay; delay = delay < 0 ? 0 : delay;
try { try {
timer.newTimeout(task, delay, unit); timer.newTimeout(task, delay, unit);

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/WorkflowTimerTask.java
View File

@ -26,7 +26,7 @@ public class WorkflowTimerTask implements TimerTask {
@Override @Override
public void run(final Timeout timeout) throws Exception { public void run(final Timeout timeout) throws Exception {
// 执行任务调度 // 执行任务调度
log.info("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), workflowTimerTaskDTO.getWorkflowTaskBatchId()); log.debug("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), workflowTimerTaskDTO.getWorkflowTaskBatchId());
try { try {