fix: 调度任务记录日志不判断jobID
This commit is contained in:
@@ -35,7 +35,6 @@ func (s cronlog) Error(err error, msg string, keysAndValues ...any) {
|
|||||||
if data, ok := job.Data.(JobData); ok {
|
if data, ok := job.Data.(JobData); ok {
|
||||||
// 日志数据
|
// 日志数据
|
||||||
jobLog := jobLogData{
|
jobLog := jobLogData{
|
||||||
JobID: job.Opts.JobId,
|
|
||||||
Timestamp: job.Timestamp,
|
Timestamp: job.Timestamp,
|
||||||
Data: data,
|
Data: data,
|
||||||
Result: err.Error(),
|
Result: err.Error(),
|
||||||
@@ -59,7 +58,6 @@ func (s cronlog) Completed(result any, msg string, keysAndValues ...any) {
|
|||||||
if data, ok := job.Data.(JobData); ok {
|
if data, ok := job.Data.(JobData); ok {
|
||||||
// 日志数据
|
// 日志数据
|
||||||
jobLog := jobLogData{
|
jobLog := jobLogData{
|
||||||
JobID: job.Opts.JobId,
|
|
||||||
Timestamp: job.Timestamp,
|
Timestamp: job.Timestamp,
|
||||||
Data: data,
|
Data: data,
|
||||||
Result: result,
|
Result: result,
|
||||||
@@ -71,7 +69,6 @@ func (s cronlog) Completed(result any, msg string, keysAndValues ...any) {
|
|||||||
|
|
||||||
// jobLogData 日志记录数据
|
// jobLogData 日志记录数据
|
||||||
type jobLogData struct {
|
type jobLogData struct {
|
||||||
JobID string
|
|
||||||
Timestamp int64
|
Timestamp int64
|
||||||
Data JobData
|
Data JobData
|
||||||
Result any
|
Result any
|
||||||
@@ -82,11 +79,6 @@ func (jl *jobLogData) SaveLog(status string) {
|
|||||||
// 读取任务信息
|
// 读取任务信息
|
||||||
sysJob := jl.Data.SysJob
|
sysJob := jl.Data.SysJob
|
||||||
|
|
||||||
// 任务ID与任务信息ID不相同
|
|
||||||
if jl.JobID == "" || jl.JobID != sysJob.JobID {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 任务日志不需要记录
|
// 任务日志不需要记录
|
||||||
if sysJob.SaveLog == "" || sysJob.SaveLog == common.STATUS_NO {
|
if sysJob.SaveLog == "" || sysJob.SaveLog == common.STATUS_NO {
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user