1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-08 22:46:51 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the problem of abnormal logs when error reports occur during… (#8522)

Browse source
This commit is contained in:
ssongliu 2025-04-30 18:37:52 +08:00 • committed by GitHub
parent a3f6dc334f
commit 4ecdbcb01f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
agent/app/repo/cronjob.go
View file

@ -162,6 +162,7 @@ func (u *CronjobRepo) EndRecords(record model.JobRecords, status, message, recor
errMap["status"] = status errMap["status"] = status
errMap["file"] = record.File errMap["file"] = record.File
errMap["message"] = message errMap["message"] = message
errMap["task_id"] = record.TaskID
errMap["interval"] = time.Since(record.StartTime).Milliseconds() errMap["interval"] = time.Since(record.StartTime).Milliseconds()
if err := global.DB.Model(&model.JobRecords{}).Where("id = ?", record.ID).Updates(errMap).Error; err != nil { 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) global.LOG.Errorf("update record status failed, err: %v", err)

4
agent/app/service/cronjob_helper.go
View file

@ -54,6 +54,10 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
if len(message) != 0 { if len(message) != 0 {
record.Records, _ = mkdirAndWriteFile(cronjob, record.StartTime, message) 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) cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), record.Records)
handleCronJobAlert(cronjob) handleCronJobAlert(cronjob)
return return

2
core/server/server.go
View file

@ -39,8 +39,8 @@ func Start() {
cron.Init() cron.Init()
session.Init() session.Init()
gin.SetMode("debug") gin.SetMode("debug")
InitOthers()
hook.Init() hook.Init()
InitOthers()
rootRouter := router.Routers() rootRouter := router.Routers()