diff --git a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineManage.java b/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineManage.java index e411a526..217bb484 100644 --- a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineManage.java +++ b/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineManage.java @@ -26,12 +26,8 @@ public class PipelineManage { pipelineTaskPool.submitTask(pipelineId, () -> { List pipelineNodeVos = initialize(); for (PipelineNodeVo pipelineNodeVo : pipelineNodeVos) { - if (Thread.currentThread().isInterrupted()) { - log.info("流水线被强行终止..."); - break; - } executePipeline(pipelineId, pipelineNodeVo); - while (!Thread.currentThread().isInterrupted() && "running".equals(pipelineNodeVo.getExecuteStatus())) { + while ("running".equals(pipelineNodeVo.getExecuteStatus())) { log.info("流水线执行中..."); ThreadUtil.safeSleep(2000); } diff --git a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineTaskPool.java b/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineTaskPool.java index f9d93cbe..5dfab0f1 100644 --- a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineTaskPool.java +++ b/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineTaskPool.java @@ -216,7 +216,9 @@ public class PipelineTaskPool { if (running.compareAndSet(true, false)) { if (currentThread != null) { - currentThread.interrupt(); +// currentThread.interrupt(); + // 暴力停止线程 + currentThread.stop(); } return true; }