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

feat: 2.1.0

Browse Source 
1. 优化回调和重试执行日志
This commit is contained in:
byteblogs168 2023-07-28 18:24:24 +08:00
parent 5ccb7ad235
commit 8d20bade33
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java
View File

@ -77,12 +77,15 @@ public class ExecCallbackUnitActor extends AbstractActor {
retryExecutor.call((Callable<Result<Void>>) () -> { retryExecutor.call((Callable<Result<Void>>) () -> {
Result<Void> result = callClient(retryTask, serverNode); Result<Void> result = callClient(retryTask, serverNode);
if (StatusEnum.YES.getStatus() != result.getStatus() && StringUtils.isNotBlank(result.getMessage())) { String message = "回调客户端成功";
retryTaskLog.setMessage(result.getMessage()); if (StatusEnum.YES.getStatus() != result.getStatus()) {
} else { if (StringUtils.isNotBlank(result.getMessage())) {
retryTaskLog.setMessage("调度成功"); message = result.getMessage();
} else {
message = "回调客户端失败: 异常信息为空";
}
} }
retryTaskLog.setMessage(message);
return result; return result;
}); });
if (context.hasException()) { if (context.hasException()) {

16
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java
View File

@ -73,18 +73,26 @@ public class ExecUnitActor extends AbstractActor {
Result<DispatchRetryResultDTO> result = callClient(retryTask, serverNode); Result<DispatchRetryResultDTO> result = callClient(retryTask, serverNode);
// 回调接口请求成功，处理返回值 // 回调接口请求成功，处理返回值
if (StatusEnum.YES.getStatus() != result.getStatus() && StringUtils.isNotBlank(result.getMessage())) { if (StatusEnum.YES.getStatus() != result.getStatus()) {
retryTaskLog.setMessage(result.getMessage()); if (StringUtils.isNotBlank(result.getMessage())) {
retryTaskLog.setMessage(result.getMessage());
} else {
retryTaskLog.setMessage("客户端执行失败: 异常信息为空");
}
} else { } else {
DispatchRetryResultDTO data = JsonUtil.parseObject(JsonUtil.toJsonString(result.getData()), DispatchRetryResultDTO.class); DispatchRetryResultDTO data = JsonUtil.parseObject(JsonUtil.toJsonString(result.getData()), DispatchRetryResultDTO.class);
result.setData(data); result.setData(data);
if (Objects.nonNull(data)) { if (Objects.nonNull(data)) {
if (RetryResultStatusEnum.FAILURE.getStatus().equals(data.getStatusCode())) { if (RetryResultStatusEnum.FAILURE.getStatus().equals(data.getStatusCode())) {
retryTaskLog.setMessage(String.valueOf(data.getExceptionMsg())); if (StringUtils.isNotBlank(data.getExceptionMsg())) {
retryTaskLog.setMessage(data.getExceptionMsg());
} else {
retryTaskLog.setMessage("客户端重试失败: 异常信息为空");
}
} else if (RetryResultStatusEnum.STOP.getStatus().equals(data.getStatusCode())) { } else if (RetryResultStatusEnum.STOP.getStatus().equals(data.getStatusCode())) {
retryTaskLog.setMessage("客户端主动停止任务"); retryTaskLog.setMessage("客户端主动停止任务");
} else { } else {
retryTaskLog.setMessage("调度成功"); retryTaskLog.setMessage("客户端执行成功");
} }
} }