修改日志

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

@@ -32,8 +32,15 @@ public class RunScriptProcessingMachine implements ProcessingMachine {
 
     @Override
     public void executor(ScriptDto scriptDto, ProcessingNodeChain processingNodeChain) {
+        boolean isRunNode = scriptDto.getRunId().contains("REAL-EXEC-");
         List<String> cmdList = Arrays.asList(scriptDto.getCommand().split(" "));
-        MythJobProcess mythJobProcess = new MythJobProcess(cmdList, null, null, scriptDto.getLogId(), stringRedisTemplate);
+        MythJobProcess mythJobProcess;
+        if(isRunNode) {
+            mythJobProcess = new MythJobProcess(cmdList, null, null, scriptDto.getLogId(), stringRedisTemplate);
+        }else {
+            mythJobProcess = new MythJobProcess(cmdList, null, null, scriptDto.getLogId(), null);
+        }
+
         //保存日志
         String logData = mythJobProcess.call();
         //成功 是0  失败是其他的   杀死是-100

byit-myth-executor/myth-executor-server/src/main/java/com/byit/process/MythJobProcess.java

@@ -88,13 +88,6 @@ public class MythJobProcess implements Callable<String>{
     @SneakyThrows
     @Override
     public String call() {
-        RunLog startRunLog = RunLog.builder().isEnd(false).runLog("start").build();
-        //stringRedisTemplate.convertAndSend(runKey, JSON.toJSONString(runLog, WriteClassName))
-        //TODO 向队尾追加一个日志
-        Long startLong =  stringRedisTemplate.opsForList().rightPush(runKey , JSON.toJSONString(startRunLog, WriteClassName));
-        if(startLong <= 0){
-            log.error("------日志信息加入redis异常，{}---------",startLong);
-        }
         //判断是否执行过
         if (this.isStarted() || this.isComplete()) {
             throw new IllegalStateException("该过程只能使用一次");

byit-myth-executor/myth-executor-server/src/main/java/com/byit/utils/LogGobbler.java

@@ -45,9 +45,11 @@ public class LogGobbler extends Thread {
                 this.buffer.append(line + "\n");
                 runLog.setRunLog(line);
                 //stringRedisTemplate.convertAndSend(runKey, JSON.toJSONString(runLog, WriteClassName))
-                //TODO 向队列队尾插入一个值
-                Long aLong = stringRedisTemplate.opsForList().rightPush(runKey, JSON.toJSONString(runLog, WriteClassName));
-                log.info("-------{}-------",aLong);
+                if (stringRedisTemplate != null) {
+                    //TODO 向队列队尾插入一个值
+                    Long aLong = stringRedisTemplate.opsForList().rightPush(runKey, JSON.toJSONString(runLog, WriteClassName));
+                    log.info("-------{}-------",aLong);
+                }
                 printLog(line);
             }
         } catch (final IOException e) {