OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_backend

Browse Source
This commit is contained in:
simonzhangsz
2023-10-25 17:29:51 +08:00
parent 9b3b36b66b d87c29e026
commit 6ab6952627
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/framework/cron/log.go
View File

@@ -37,7 +37,7 @@ func (s cronlog) Error(err error, msg string, keysAndValues ...any) {
jobLog := jobLogData{ jobLog := jobLogData{
JobID: job.Opts.JobId, JobID: job.Opts.JobId,
Timestamp: job.Timestamp, Timestamp: job.Timestamp,
SysJob: data.SysJob, Data: data,
Result: err.Error(), Result: err.Error(),
} }
jobLog.SaveLog(common.STATUS_NO) jobLog.SaveLog(common.STATUS_NO)
@@ -61,7 +61,7 @@ func (s cronlog) Completed(result any, msg string, keysAndValues ...any) {
jobLog := jobLogData{ jobLog := jobLogData{
JobID: job.Opts.JobId, JobID: job.Opts.JobId,
Timestamp: job.Timestamp, Timestamp: job.Timestamp,
SysJob: data.SysJob, Data: data,
Result: result, Result: result,
} }
jobLog.SaveLog(common.STATUS_YES) jobLog.SaveLog(common.STATUS_YES)
@@ -73,14 +73,14 @@ func (s cronlog) Completed(result any, msg string, keysAndValues ...any) {
type jobLogData struct { type jobLogData struct {
JobID string JobID string
Timestamp int64 Timestamp int64
SysJob model.SysJob Data JobData
Result any Result any
} }
// SaveLog 日志记录保存 // SaveLog 日志记录保存
func (jl *jobLogData) SaveLog(status string) { func (jl *jobLogData) SaveLog(status string) {
// 读取任务信息 // 读取任务信息
sysJob := jl.SysJob sysJob := jl.Data.SysJob
// 任务ID与任务信息ID不相同 // 任务ID与任务信息ID不相同
if jl.JobID == "" || jl.JobID != sysJob.JobID { if jl.JobID == "" || jl.JobID != sysJob.JobID {
@@ -101,6 +101,7 @@ func (jl *jobLogData) SaveLog(status string) {
// 结果信息序列化字符串 // 结果信息序列化字符串
jsonByte, _ := json.Marshal(map[string]any{ jsonByte, _ := json.Marshal(map[string]any{
"name": resultNmae, "name": resultNmae,
"crom": jl.Data.Repeat,
"message": jl.Result, "message": jl.Result,
}) })
jobMsg := string(jsonByte) jobMsg := string(jsonByte)