From 4ecdbcb01f29e8154cfcdfabab5cd1afbfdb237d Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 30 Apr 2025 18:37:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Fix=20the=20problem=20of=20abnormal=20lo?=
 =?UTF-8?q?gs=20when=20error=20reports=20occur=20during=E2=80=A6=20(#8522)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agent/app/repo/cronjob.go           | 1 +
 agent/app/service/cronjob_helper.go | 4 ++++
 core/server/server.go               | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/agent/app/repo/cronjob.go b/agent/app/repo/cronjob.go
index c55081a08..06aaa8bcf 100644
--- a/agent/app/repo/cronjob.go
+++ b/agent/app/repo/cronjob.go
@@ -162,6 +162,7 @@ func (u *CronjobRepo) EndRecords(record model.JobRecords, status, message, recor
 	errMap["status"] = status
 	errMap["file"] = record.File
 	errMap["message"] = message
+	errMap["task_id"] = record.TaskID
 	errMap["interval"] = time.Since(record.StartTime).Milliseconds()
 	if err := global.DB.Model(&model.JobRecords{}).Where("id = ?", record.ID).Updates(errMap).Error; err != nil {
 		global.LOG.Errorf("update record status failed, err: %v", err)
diff --git a/agent/app/service/cronjob_helper.go b/agent/app/service/cronjob_helper.go
index 558cf03b3..325d1cd10 100644
--- a/agent/app/service/cronjob_helper.go
+++ b/agent/app/service/cronjob_helper.go
@@ -54,6 +54,10 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
 			if len(message) != 0 {
 				record.Records, _ = mkdirAndWriteFile(cronjob, record.StartTime, message)
 			}
+			taskItem, _ := taskRepo.GetFirst(taskRepo.WithByID(record.TaskID))
+			if len(taskItem.ID) == 0 {
+				record.TaskID = ""
+			}
 			cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), record.Records)
 			handleCronJobAlert(cronjob)
 			return
diff --git a/core/server/server.go b/core/server/server.go
index 55cb1a3d3..18a850495 100644
--- a/core/server/server.go
+++ b/core/server/server.go
@@ -39,8 +39,8 @@ func Start() {
 	cron.Init()
 	session.Init()
 	gin.SetMode("debug")
-	InitOthers()
 	hook.Init()
+	InitOthers()
 
 	rootRouter := router.Routers()