执行机错误传递

byit-myth-executor/myth-executor-server/src/main/java/com/byit/node/impl/CommandAndScriptProcessingMachine.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.byit.dto.executor.ScriptDto;
 import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
 import com.byit.enums.PlaceholderEnum;
+import com.byit.exceptions.ExecutorException;
 import com.byit.filesystem.FileSystem;
 import com.byit.job.utils.DateUtil;
 import com.byit.job.utils.PlaceholderUtils;
@@ -41,6 +42,7 @@ public class CommandAndScriptProcessingMachine implements ProcessingMachine {
 
     @Override
     public void executor(ScriptDto scriptDto, ProcessingNodeChain processingNodeChain) {
+        try {
             log.debug("-----执行到命令和脚本的处理节点，开始初始化命令和脚本------------");
             String command = scriptDto.getCommand();
             log.debug("-----初始命令为{}------------",command);
@@ -65,6 +67,10 @@ public class CommandAndScriptProcessingMachine implements ProcessingMachine {
             //将脚本的携带的参数 拼接在命令后方  python test.py -sex 男 -name 张三 -age 14
             log.info("---------命令及脚本参数处理完成，此节点处理数据为:[{}]-----------",scriptDto);
             processingNodeChain.doProcessing(scriptDto,processingNodeChain);
+        }catch (Exception e) {
+            e.printStackTrace();
+            throw new ExecutorException(e);
+        }
     }
 
     /**

byit-myth-executor/myth-executor-server/src/main/java/com/byit/node/impl/LogDataProcessingMachine.java

@@ -59,6 +59,7 @@ public class LogDataProcessingMachine implements ProcessingMachine {
                 logPath = fileSystem.uploadFile(logDataByte,LOG_SUFFIX,fileMateData);
             }
             scriptDto.setLogRemotePath(logPath);
+            processingNodeChain.doProcessing(scriptDto,processingNodeChain);
         }catch (Exception e) {
             e.printStackTrace();
             throw new ExecutorException(e);

byit-myth-executor/myth-executor-server/src/main/java/com/byit/node/impl/RunScriptProcessingMachine.java

 package com.byit.node.impl;
 
 import com.byit.dto.executor.ScriptDto;
+import com.byit.exceptions.ExecutorException;
 import com.byit.node.ProcessingNodeChain;
 import com.byit.node.machine.ProcessingMachine;
 import com.byit.process.MythJobProcess;
@@ -32,6 +33,7 @@ public class RunScriptProcessingMachine implements ProcessingMachine {
 
     @Override
     public void executor(ScriptDto scriptDto, ProcessingNodeChain processingNodeChain) {
+        try {
             boolean isRunNode = scriptDto.getRunId().contains("REAL-EXEC-");
             List<String> cmdList = Arrays.asList(scriptDto.getCommand().split(" "));
             MythJobProcess mythJobProcess;
@@ -52,5 +54,8 @@ public class RunScriptProcessingMachine implements ProcessingMachine {
             scriptDto.setRunLogData(logData);
             scriptDto.setExitCode(exitCode);
             processingNodeChain.doProcessing(scriptDto,processingNodeChain);
+        } catch (Exception e) {
+            throw new ExecutorException(e);
+        }
     }
 }