|
|
@ -19,7 +19,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
c.gormClient.Db.Create(&jobs_gorm_model.TaskLog{
|
|
|
|
c.gormClient.GetDb().Create(&jobs_gorm_model.TaskLog{
|
|
|
|
TaskId: task.Id,
|
|
|
|
TaskId: task.Id,
|
|
|
|
TaskRunId: runId,
|
|
|
|
TaskRunId: runId,
|
|
|
|
TaskResultCode: taskResultCode,
|
|
|
|
TaskResultCode: taskResultCode,
|
|
|
@ -53,7 +53,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
|
|
|
|
|
|
|
|
|
|
|
|
switch taskResultCode {
|
|
|
|
switch taskResultCode {
|
|
|
|
case 0:
|
|
|
|
case 0:
|
|
|
|
err := c.EditTask(c.gormClient.Db, task.Id).
|
|
|
|
err := c.EditTask(c.gormClient.GetDb(), task.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: runId,
|
|
|
|
RunId: runId,
|
|
|
@ -66,7 +66,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
|
|
|
|
return
|
|
|
|
return
|
|
|
|
case CodeSuccess:
|
|
|
|
case CodeSuccess:
|
|
|
|
// 执行成功
|
|
|
|
// 执行成功
|
|
|
|
err := c.EditTask(c.gormClient.Db, task.Id).
|
|
|
|
err := c.EditTask(c.gormClient.GetDb(), task.Id).
|
|
|
|
Select("status_desc", "number", "run_id", "updated_ip", "result", "next_run_time").
|
|
|
|
Select("status_desc", "number", "run_id", "updated_ip", "result", "next_run_time").
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
StatusDesc: "执行成功",
|
|
|
|
StatusDesc: "执行成功",
|
|
|
@ -81,7 +81,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
|
|
|
|
}
|
|
|
|
}
|
|
|
|
case CodeEnd:
|
|
|
|
case CodeEnd:
|
|
|
|
// 执行成功、提前结束
|
|
|
|
// 执行成功、提前结束
|
|
|
|
err := c.EditTask(c.gormClient.Db, task.Id).
|
|
|
|
err := c.EditTask(c.gormClient.GetDb(), task.Id).
|
|
|
|
Select("status", "status_desc", "number", "updated_ip", "result", "next_run_time").
|
|
|
|
Select("status", "status_desc", "number", "updated_ip", "result", "next_run_time").
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
Status: TASK_SUCCESS,
|
|
|
|
Status: TASK_SUCCESS,
|
|
|
@ -96,7 +96,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
|
|
|
|
}
|
|
|
|
}
|
|
|
|
case CodeError:
|
|
|
|
case CodeError:
|
|
|
|
// 执行失败
|
|
|
|
// 执行失败
|
|
|
|
err := c.EditTask(c.gormClient.Db, task.Id).
|
|
|
|
err := c.EditTask(c.gormClient.GetDb(), task.Id).
|
|
|
|
Select("status_desc", "number", "run_id", "updated_ip", "result", "next_run_time").
|
|
|
|
Select("status_desc", "number", "run_id", "updated_ip", "result", "next_run_time").
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
StatusDesc: "执行失败",
|
|
|
|
StatusDesc: "执行失败",
|
|
|
@ -114,7 +114,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
|
|
|
|
if task.MaxNumber != 0 {
|
|
|
|
if task.MaxNumber != 0 {
|
|
|
|
if task.Number+1 >= task.MaxNumber {
|
|
|
|
if task.Number+1 >= task.MaxNumber {
|
|
|
|
// 关闭执行
|
|
|
|
// 关闭执行
|
|
|
|
err := c.EditTask(c.gormClient.Db, task.Id).
|
|
|
|
err := c.EditTask(c.gormClient.GetDb(), task.Id).
|
|
|
|
Select("status").
|
|
|
|
Select("status").
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
Updates(jobs_gorm_model.Task{
|
|
|
|
Status: TASK_TIMEOUT,
|
|
|
|
Status: TASK_TIMEOUT,
|
|
|
|