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 d1c0e8b..c40814e 100644 --- a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java +++ b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java @@ -207,7 +207,7 @@ public class CommandExecutor { } // 打印一下 debug - commandExecLogCache.PrintCommandCachedLog(streamKey); + //commandExecLogCache.PrintCommandCachedLog(streamKey); // 关停任务执行的缓存日志收集 BufferedReader 否则无法终止 commandExecLogCache.StopExecLogBufferedReader( @@ -216,7 +216,11 @@ public class CommandExecutor { ); // 异步执行日志的发送工作 - //commandExecLogCache.CollectAndSendExecLog(streamKey, needResultReplay, octopusMessage); + commandExecLogCache.CollectAndSendExecLog( + streamKey, + needResultReplay, + octopusMessage + ); // 执行到这里,说明整个任务流程结束(超时结束) log.debug( 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 7002acd..cd1a5b9 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 @@ -148,6 +148,7 @@ public class CommandExecLogCache { streamKey, bufferedReader ); + // 使用统一进程执行缓存和关停动作 LogCacheDaemonThread.submit( () -> {