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 895c07b..ba3e682 100644 --- a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java +++ b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java @@ -116,11 +116,7 @@ public class CommandExecutor { commandExecWaitTimeout = durationTaskMaxWaitSeconds; } - // 缓存 命令处理日志 - commandExecLogCache.cacheLog( - streamKey, - process - ); + // 2023年2月23日 同时执行log日志部分移动至此部分处理 AgentCommonThreadPool.pool.submit( @@ -185,6 +181,13 @@ public class CommandExecutor { throw new RuntimeException(e); } finally { + // 缓存 命令处理日志 + commandExecLogCache.cacheLog( + streamKey, + process + ); + + // 任务提前执行结束,或者超过了最长等待时间 // 判断命令是否正确处理完成 if (!commandExecComplete) { 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 5bb8885..9ef34ee 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 @@ -58,6 +58,7 @@ public class CommandExecLogCache { ); // add the command + commandCachedLog.add(""); commandCachedLog.add(execCommandString); commandCachedLog.add(execTimeString); commandCachedLog.add(execResultString);