From 26e8d3caf198e0de68b1dbeba770890debdca81f Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Sun, 7 Apr 2024 14:49:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(3.2.0):=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actor/exec/ExecCallbackUnitActor.java | 21 +----------- .../dispatch/actor/exec/ExecUnitActor.java | 33 ------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecCallbackUnitActor.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecCallbackUnitActor.java index f31814f7..2ad16ee8 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecCallbackUnitActor.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecCallbackUnitActor.java @@ -67,34 +67,15 @@ public class ExecCallbackUnitActor extends AbstractActor { if (Objects.nonNull(serverNode)) { retryExecutor.call((Callable>) () -> { Result result = callClient(retryTask, serverNode, sceneConfig); - - String message = "回调客户端成功"; - if (StatusEnum.YES.getStatus() != result.getStatus()) { - if (StrUtil.isNotBlank(result.getMessage())) { - message = result.getMessage(); - } else { - message = "回调客户端失败: 异常信息为空"; - } - } -// retryTaskLog.setMessage(message); return result; }); - if (context.hasException()) { -// retryTaskLog.setMessage(context.getException().getMessage()); - } - } else { -// retryTaskLog.setMessage("There are currently no available client PODs."); } } catch (Exception e) { RetryLogMetaDTO retryLogMetaDTO = RetryTaskConverter.INSTANCE.toLogMetaDTO(retryTask); retryLogMetaDTO.setTimestamp(DateUtils.toNowMilli()); - EasyRetryLog.REMOTE.error("请求客户端异常. <|>{}<|>", retryTask.getUniqueId(), retryLogMetaDTO, e);// retryTaskLog.setMessage(StringUtils.isBlank(e.getMessage()) ? StrUtil.EMPTY : e.getMessage()); + EasyRetryLog.REMOTE.error("请求客户端异常. <|>{}<|>", retryTask.getUniqueId(), retryLogMetaDTO, e); } finally { - -// ActorRef actorRef = ActorGenerator.logActor(); -// actorRef.tell(retryTaskLog, actorRef); - getContext().stop(getSelf()); } diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecUnitActor.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecUnitActor.java index 1af0a9a1..1426ecc6 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecUnitActor.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecUnitActor.java @@ -50,10 +50,6 @@ public class ExecUnitActor extends AbstractActor { RegisterNodeInfo serverNode = context.getServerNode(); SceneConfig sceneConfig = context.getSceneConfig(); -// RetryTaskLogDTO retryTaskLog = RetryTaskLogConverter.INSTANCE.toRetryTaskLogDTO(retryTask); -// retryTaskLog.setTriggerTime(LocalDateTime.now()); -// retryTaskLog.setClientInfo(ClientInfoUtils.generate(serverNode)); - try { if (Objects.nonNull(serverNode)) { @@ -61,42 +57,16 @@ public class ExecUnitActor extends AbstractActor { retryExecutor.call((Callable>) () -> { Result result = callClient(retryTask, serverNode, sceneConfig); - // 回调接口请求成功，处理返回值 if (StatusEnum.YES.getStatus() != result.getStatus()) { - if (StrUtil.isNotBlank(result.getMessage())) { -// retryTaskLog.setMessage(result.getMessage()); - } else { -// retryTaskLog.setMessage("客户端执行失败: 异常信息为空"); - } } else { DispatchRetryResultDTO data = JsonUtil.parseObject(JsonUtil.toJsonString(result.getData()), DispatchRetryResultDTO.class); result.setData(data); - if (Objects.nonNull(data)) { - if (RetryResultStatusEnum.FAILURE.getStatus().equals(data.getStatusCode())) { - if (StrUtil.isNotBlank(data.getExceptionMsg())) { -// retryTaskLog.setMessage(data.getExceptionMsg()); - } else { -// retryTaskLog.setMessage("客户端重试失败: 异常信息为空"); - } - } else if (RetryResultStatusEnum.STOP.getStatus().equals(data.getStatusCode())) { -// retryTaskLog.setMessage("客户端主动停止任务"); - } else { -// retryTaskLog.setMessage("客户端执行成功"); - } - } - } return result; }); - // 请求发生异常 - if (context.hasException()) { -// retryTaskLog.setMessage(context.getException().getMessage()); - } - } else { -// retryTaskLog.setMessage("There are currently no available client PODs."); } } catch (Exception e) { @@ -104,9 +74,6 @@ public class ExecUnitActor extends AbstractActor { retryLogMetaDTO.setTimestamp(DateUtils.toNowMilli()); EasyRetryLog.REMOTE.error("请求客户端异常. <|>{}<|>", retryTask.getUniqueId(), retryLogMetaDTO, e); } finally { - -// ActorRef actorRef = ActorGenerator.logActor(); -// actorRef.tell(retryTaskLog, actorRef); getContext().stop(getSelf()); }