From e92792ccc486046e64e0af794ea7fd3c8e379571 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Sat, 25 Feb 2023 23:01:39 +0800
Subject: [PATCH] [agent][executor]- bug - 7

---
 .../wdd/agent/executor/CommandExecutor.java   |  5 +---
 .../executor/thread/CommandExecLogCache.java  | 23 ++++++-------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
index 2a6daef..db649d7 100644
--- a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
+++ b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
@@ -252,13 +252,10 @@ public class CommandExecutor {
                     octopusMessage
             );*/
 
-            // 执行到这里,说明整个任务流程结束
+            // 执行到这里,说明整个任务流程结束(超时结束)
             log.debug(
                     "命令 [ {} ] 执行全流程结束!",
                     process
-                            .info()
-                            .commandLine()
-                            .get()
             );
             if (process.isAlive()) {
                 // shutdown the process
diff --git a/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java b/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java
index e26acc5..060d3d3 100644
--- a/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java
+++ b/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java
@@ -1,7 +1,6 @@
 package io.wdd.agent.executor.thread;
 
 
-import io.wdd.agent.config.utils.AgentCommonThreadPool;
 import io.wdd.common.handler.MyRuntimeException;
 import io.wdd.common.utils.TimeUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -22,13 +21,12 @@ import java.util.HashMap;
 @Slf4j
 public class CommandExecLogCache {
 
-    // 存储命令执行缓存日志
-    public static HashMap<String, ArrayList<String>> CachedCommandLogMap = new HashMap<>();
-
     /**
      * 存储命令执行为空的默认空结果
      */
     private static final ArrayList<String> EmptyCommandLog = new ArrayList<>();
+    // 存储命令执行缓存日志
+    public static HashMap<String, ArrayList<String>> CachedCommandLogMap = new HashMap<>();
 
     /**
      * 缓存命令执行日志
@@ -50,14 +48,13 @@ public class CommandExecLogCache {
         );
 
         // 这里需要采用异步的方式执行
-        AgentCommonThreadPool.pool.submit(
-                () ->  // cache the real command logs
-                        doCacheLog(
-                                streamKey,
-                                process
-                        )
+        // cache the real command logs
+        doCacheLog(
+                streamKey,
+                process
         );
 
+
     }
 
 
@@ -146,12 +143,6 @@ public class CommandExecLogCache {
         commandCachedLog.add("--------------- command result are as below --------------------");
         commandCachedLog.add("");
 
-        log.debug(
-                "命令执行结果头信息操作完成,内容为 {}",
-                commandCachedLog
-        );
-
-
         log.debug("doCacheLog 开始从process的结果中获取日志缓存");
 
         // read from input stream and store to the cacheArrayList