update task
This commit is contained in:
11
task.go
11
task.go
@@ -10,6 +10,7 @@ package task
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"git.zhangdeman.cn/zhangdeman/wrapper"
|
||||
"runtime"
|
||||
"sync"
|
||||
"time"
|
||||
@@ -51,10 +52,10 @@ func (d *dispatch) Register(taskInstanceList ...ITask) error {
|
||||
if nil == taskInstance {
|
||||
continue
|
||||
}
|
||||
if _, exist := d.taskTable[taskInstance.Name()]; exist {
|
||||
return fmt.Errorf("%s 任务重复注册! ", taskInstance.Name())
|
||||
if _, exist := d.taskTable[taskInstance.GetFlag()]; exist {
|
||||
return fmt.Errorf("%s 任务重复注册! ", taskInstance.GetFlag())
|
||||
}
|
||||
d.taskTable[taskInstance.Name()] = taskInstance
|
||||
d.taskTable[taskInstance.GetFlag()] = taskInstance
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -104,7 +105,7 @@ func (d *dispatch) Run(ctx context.Context, cfg *Config) *Result {
|
||||
StartTime: time.Now().UnixNano(),
|
||||
FinishTime: 0,
|
||||
Used: 0,
|
||||
TaskRunID: "",
|
||||
TaskRunID: wrapper.StringFromRandom(64, "").Md5().Value,
|
||||
TaskDescription: "",
|
||||
TaskConfig: cfg,
|
||||
Data: nil,
|
||||
@@ -131,13 +132,11 @@ func (d *dispatch) Run(ctx context.Context, cfg *Config) *Result {
|
||||
}
|
||||
}
|
||||
result = taskInstance.Execute(ctx, cfg)
|
||||
result.TaskRunID = taskInstance.GetRunID()
|
||||
result.TaskDescription = taskInstance.Description()
|
||||
_ = taskInstance.Callback(result)
|
||||
}()
|
||||
} else {
|
||||
result = taskInstance.Execute(ctx, cfg)
|
||||
result.TaskRunID = taskInstance.GetRunID()
|
||||
result.TaskDescription = taskInstance.Description()
|
||||
_ = taskInstance.Callback(result)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user