Merge pull request #2969 from wangyu096/issue_2955

fix: agent异常情况下，脚本执行日志输出 null #2955
TencentBlueKing · May 10, 2024 · 3e1736f · 3e1736f
2 parents 1b4a334 + cf4eab0
commit 3e1736f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...xecute/src/main/java/com/tencent/bk/job/execute/engine/result/ScriptResultHandleTask.java b/...xecute/src/main/java/com/tencent/bk/job/execute/engine/result/ScriptResultHandleTask.java
@@ -359,8 +359,10 @@ private void addScriptLogsAndRefreshPullProgress(List<ServiceExecuteObjectScript
         ExecuteObject executeObject = findExecuteObject(executeObjectGseKey);
         if (GSECode.AtomicErrorCode.getErrorCode(executeObjectTaskResult.getErrorCode())
             == GSECode.AtomicErrorCode.ERROR) {
-            logs.add(logService.buildSystemScriptLog(stepInstance, executeObject,
-                executeObjectTaskResult.getErrorMsg(), executeObjectTask.getScriptLogOffset(), currentTime));
+            if (StringUtils.isNotEmpty(executeObjectTaskResult.getErrorMsg())) {
+                logs.add(logService.buildSystemScriptLog(stepInstance, executeObject,
+                    executeObjectTaskResult.getErrorMsg(), executeObjectTask.getScriptLogOffset(), currentTime));
+            }
         } else {
             String content = executeObjectTaskResult.getScreen();
             if (StringUtils.isEmpty(content)) {