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 84a329c..ba19d99 100644 --- a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java +++ b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java @@ -185,7 +185,6 @@ public class CommandExecutor { process ); - // 任务提前执行结束,或者超过了最长等待时间 // 判断命令是否正确处理完成 if (!commandExecComplete) { @@ -209,8 +208,8 @@ public class CommandExecutor { // 只有当该进程还存活,执行关闭操作 if (process.isAlive()) { // shutdown the process + log.debug("开始销毁命令执行进程!"); 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 69a289b..ac87800 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 @@ -40,7 +40,7 @@ public class CommandExecLogCache { log.debug( "开始缓存命令执行日志! process is {}", - process + process.info() ); if (ObjectUtils.isEmpty(process)) { @@ -114,6 +114,8 @@ public class CommandExecLogCache { */ private void doCacheLog(String streamKey, InputStream commandLogStream, ArrayList commandCachedLog) { + log.debug("开始从process的结果中获取日志缓存"); + // read from input stream and store to the cacheArrayList new BufferedReader(new InputStreamReader(commandLogStream)) .lines()