- update run_id

master v1.0.84
李光春 2 years ago
parent 79b18ef741
commit 1d1be8330b

@ -1,6 +1,6 @@
package gojobs package gojobs
const ( const (
Version = "1.0.83" Version = "1.0.84"
SpecifyIpNull = "0.0.0.0" SpecifyIpNull = "0.0.0.0"
) )

@ -3,12 +3,19 @@ package gojobs
import ( import (
"context" "context"
"go.dtapp.net/gojobs/jobs_gorm_model" "go.dtapp.net/gojobs/jobs_gorm_model"
"go.dtapp.net/gostring"
"go.dtapp.net/gotime" "go.dtapp.net/gotime"
"go.dtapp.net/gotrace_id"
) )
// Run 运行 // Run 运行
func (c *Client) Run(ctx context.Context, info jobs_gorm_model.Task, status int, result string) { func (c *Client) Run(ctx context.Context, info jobs_gorm_model.Task, status int, result string) {
runId := gotrace_id.GetTraceIdContext(ctx)
if runId == "" {
c.zapLog.WithTraceId(ctx).Sugar().Errorf("[gojobs.Run]%s", "上下文没有跟踪编号")
return
}
// 请求函数记录 // 请求函数记录
err := c.db.gormClient.Db.Create(&jobs_gorm_model.TaskLog{ err := c.db.gormClient.Db.Create(&jobs_gorm_model.TaskLog{
TaskId: info.Id, TaskId: info.Id,
@ -23,7 +30,7 @@ func (c *Client) Run(ctx context.Context, info jobs_gorm_model.Task, status int,
err = c.EditTask(c.db.gormClient.Db, info.Id). err = c.EditTask(c.db.gormClient.Db, info.Id).
Select("run_id", "result", "next_run_time"). Select("run_id", "result", "next_run_time").
Updates(jobs_gorm_model.Task{ Updates(jobs_gorm_model.Task{
RunId: gostring.GetUuId(), RunId: runId,
Result: result, Result: result,
NextRunTime: gotime.Current().AfterSeconds(info.Frequency).Time, NextRunTime: gotime.Current().AfterSeconds(info.Frequency).Time,
}).Error }).Error
@ -40,7 +47,7 @@ func (c *Client) Run(ctx context.Context, info jobs_gorm_model.Task, status int,
Updates(jobs_gorm_model.Task{ Updates(jobs_gorm_model.Task{
StatusDesc: "执行成功", StatusDesc: "执行成功",
Number: info.Number + 1, Number: info.Number + 1,
RunId: gostring.GetUuId(), RunId: runId,
UpdatedIp: c.config.systemOutsideIp, UpdatedIp: c.config.systemOutsideIp,
Result: result, Result: result,
NextRunTime: gotime.Current().AfterSeconds(info.Frequency).Time, NextRunTime: gotime.Current().AfterSeconds(info.Frequency).Time,
@ -72,7 +79,7 @@ func (c *Client) Run(ctx context.Context, info jobs_gorm_model.Task, status int,
Updates(jobs_gorm_model.Task{ Updates(jobs_gorm_model.Task{
StatusDesc: "执行失败", StatusDesc: "执行失败",
Number: info.Number + 1, Number: info.Number + 1,
RunId: gostring.GetUuId(), RunId: runId,
UpdatedIp: c.config.systemOutsideIp, UpdatedIp: c.config.systemOutsideIp,
Result: result, Result: result,
NextRunTime: gotime.Current().AfterSeconds(info.Frequency).Time, NextRunTime: gotime.Current().AfterSeconds(info.Frequency).Time,

Loading…
Cancel
Save