[agent][executor]- bug - 14
This commit is contained in:
@@ -151,6 +151,13 @@ public class CommandExecutor {
|
|||||||
|
|
||||||
private void DaemonCommandProcessAndCollectLog(Process process, int commandExecWaitTimeout, CountDownLatch countDownLatch, boolean needResultReplay, String streamKey, OctopusMessage octopusMessage) {
|
private void DaemonCommandProcessAndCollectLog(Process process, int commandExecWaitTimeout, CountDownLatch countDownLatch, boolean needResultReplay, String streamKey, OctopusMessage octopusMessage) {
|
||||||
|
|
||||||
|
// 缓存 命令处理日志
|
||||||
|
// 如果是特别简单的命令,必须要放在此处才可以,否则会导致 无法收集
|
||||||
|
commandExecLogCache.cacheLog(
|
||||||
|
streamKey,
|
||||||
|
process
|
||||||
|
);
|
||||||
|
|
||||||
boolean commandExecComplete = false;
|
boolean commandExecComplete = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -175,13 +182,6 @@ public class CommandExecutor {
|
|||||||
|
|
||||||
System.out.println("process isAlive = " + process.isAlive());
|
System.out.println("process isAlive = " + process.isAlive());
|
||||||
|
|
||||||
// 缓存 命令处理日志
|
|
||||||
// 如果是特别简单的命令,必须要放在此处才可以,否则会导致 无法收集
|
|
||||||
commandExecLogCache.cacheLog(
|
|
||||||
streamKey,
|
|
||||||
process
|
|
||||||
);
|
|
||||||
|
|
||||||
// 任务提前执行结束,或者超过了最长等待时间
|
// 任务提前执行结束,或者超过了最长等待时间
|
||||||
// 判断命令是否正确处理完成
|
// 判断命令是否正确处理完成
|
||||||
if (!commandExecComplete) {
|
if (!commandExecComplete) {
|
||||||
@@ -204,7 +204,6 @@ public class CommandExecutor {
|
|||||||
.info()
|
.info()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打印一下 debug
|
// 打印一下 debug
|
||||||
|
|||||||
Reference in New Issue
Block a user