From 21d4a4180e10906fc00772532f00bbcfbb47af0a Mon Sep 17 00:00:00 2001 From: bryan31 Date: Wed, 22 Sep 2021 12:18:23 +0800 Subject: [PATCH] =?UTF-8?q?bug=20#I4BAJC=20setIsEnd=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E7=9A=84=E6=B5=81=E7=A8=8B=E4=B8=8D=E9=9C=80=E8=A6=81=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yomahub/liteflow/entity/flow/Chain.java | 8 ++++++-- .../src/test/resources/component/application.properties | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Chain.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Chain.java index d816be4b1..52596c365 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Chain.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Chain.java @@ -14,6 +14,7 @@ import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.entity.data.DataBus; import com.yomahub.liteflow.entity.data.Slot; import com.yomahub.liteflow.enums.ExecuteTypeEnum; +import com.yomahub.liteflow.exception.ChainEndException; import com.yomahub.liteflow.exception.ConfigErrorException; import com.yomahub.liteflow.exception.FlowSystemException; import com.yomahub.liteflow.exception.WhenExecuteException; @@ -80,11 +81,14 @@ public class Chain implements Executable { //进行重试循环判断，如果重试次数为0，则只进行一次循环 for (int i = 0; i <= liteflowConfig.getRetryCount(); i++) { try { - if (i > 0){ - LOG.info("[{}]:component[{}] performs {} retry", slot.getRequestId(), executableItem.getExecuteName(), i+1); + if (i > 0) { + LOG.info("[{}]:component[{}] performs {} retry", slot.getRequestId(), executableItem.getExecuteName(), i + 1); } executableItem.execute(slotIndex); break; + } catch (ChainEndException e){ + //如果是ChainEndException，则无需重试 + throw e; } catch (Exception e) { if (i >= liteflowConfig.getRetryCount()){ throw e; diff --git a/liteflow-testcase-springboot/src/test/resources/component/application.properties b/liteflow-testcase-springboot/src/test/resources/component/application.properties index d5b0e66d5..d7ed8babe 100644 --- a/liteflow-testcase-springboot/src/test/resources/component/application.properties +++ b/liteflow-testcase-springboot/src/test/resources/component/application.properties @@ -1 +1,2 @@ -liteflow.rule-source=component/flow.xml \ No newline at end of file +liteflow.rule-source=component/flow.xml +liteflow.retry_count=3 \ No newline at end of file