From bd5dd0ea09bd7941c2be19f7ff20ee87c59ff9a7 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Sat, 25 Feb 2023 18:48:03 +0800
Subject: [PATCH] [agent][executor]- bug - 2

---
 .../java/io/wdd/agent/executor/CommandExecutor.java  | 12 ++++++++++++
 .../agent/executor/thread/CommandExecLogCache.java   |  5 ++---
 2 files changed, 14 insertions(+), 3 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 4fdd0d7..fc92d40 100644
--- a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
+++ b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
@@ -228,6 +228,18 @@ public class CommandExecutor {
                         octopusMessage
                 );
 
+                // 执行到这里,说明整个任务流程结束
+                log.debug(
+                        "命令 [ {} ]执行全流程结束!",
+                        process
+                                .info()
+                                .commandLine()
+                                .get()
+                );
+                if (process.isAlive()) {
+                    // shutdown the process
+                    process.destroyForcibly();
+                }
             }
         };
     }
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 c6ede45..179c938 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
@@ -42,7 +42,7 @@ public class CommandExecLogCache {
                 process.info()
         );
 
-        if (ObjectUtils.isEmpty(process.getInputStream())) {
+        if (ObjectUtils.isEmpty(process.exitValue())) {
             log.error("process is null ! cache log error !");
             return;
         }
@@ -74,7 +74,6 @@ public class CommandExecLogCache {
                 commandCachedLog
         );
 
-
         // cache the real command logs
         doCacheLog(
                 streamKey,
@@ -100,7 +99,7 @@ public class CommandExecLogCache {
         );
 
         // 清除Key
-        CachedCommandLogMap.remove(streamKey);
+        //CachedCommandLogMap.remove(streamKey);
 
         return execLogCacheArrayList;
     }