From b8b1cc004873248a9ae35b20acaedca12ee82b57 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Mon, 2 Dec 2024 12:14:33 +0800 Subject: [PATCH] =?UTF-8?q?LOG=E7=B1=BB=E7=BB=9F=E4=B8=80=E5=8C=96?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9A=84=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yomahub/liteflow/core/FlowExecutor.java | 14 ++------------ .../main/java/com/yomahub/liteflow/log/LFLog.java | 2 ++ .../main/java/com/yomahub/liteflow/slot/Slot.java | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java index 50118790e..be886421e 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java @@ -478,20 +478,10 @@ public class FlowExecutor { catch (Exception e) { if (ObjectUtil.isNotNull(chain)) { String errMsg = StrUtil.format("chain[{}] execute error on slot[{}]", chain.getChainId(), slotIndex); - if (BooleanUtil.isTrue(liteflowConfig.getPrintExecutionLog())) { - LOG.error(errMsg, e); - } - else { - LOG.error(errMsg); - } + LOG.error(errMsg, e); } else { - if (BooleanUtil.isTrue(liteflowConfig.getPrintExecutionLog())) { - LOG.error(e.getMessage(), e); - } - else { - LOG.error(e.getMessage()); - } + LOG.error(e.getMessage(), e); } // 如果是正常流程需要把异常设置到slot的exception属性里 diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/log/LFLog.java b/liteflow-core/src/main/java/com/yomahub/liteflow/log/LFLog.java index 83665f269..fa41b9cdf 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/log/LFLog.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/log/LFLog.java @@ -373,6 +373,8 @@ public class LFLog implements Logger{ public void error(String s, Throwable throwable) { if (isPrint()) { this.log.error(getRId() + s, throwable); + }else{ + this.log.error(getRId() + s); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java b/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java index ad109c4e8..0b976c9cd 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java @@ -382,9 +382,7 @@ public class Slot { if (ObjectUtil.isNull(this.executeStepsStr)) { this.executeStepsStr = getExecuteStepStr(true); } - if (LiteflowConfigGetter.get().getPrintExecutionLog()) { - LOG.info("CHAIN_NAME[{}]\n{}", this.getChainName(), this.executeStepsStr); - } + LOG.info("CHAIN_NAME[{}]\n{}", this.getChainName(), this.executeStepsStr); } public void addRollbackStep(CmpStep step) { @@ -418,9 +416,7 @@ public class Slot { if (ObjectUtil.isNull(this.rollbackStepsStr)) { this.rollbackStepsStr = getRollbackStepStr(true); } - if (LiteflowConfigGetter.get().getPrintExecutionLog()) { - LOG.info("ROLLBACK_CHAIN_NAME[{}]\n{}", this.getChainName(), this.rollbackStepsStr); - } + LOG.info("ROLLBACK_CHAIN_NAME[{}]\n{}", this.getChainName(), this.rollbackStepsStr); }