- 整理tasksch

This commit is contained in:
gazebo
2019-08-01 20:07:39 +08:00
parent 76d1817348
commit 402e60ab50
3 changed files with 21 additions and 19 deletions

View File

@@ -41,12 +41,14 @@ func (task *SeqTask) Run() {
return task.worker(task, i, task.params...)
})
task.finishedOneJob(1, err)
if taskErr = err; taskErr != nil {
task.locker.Lock()
task.batchErrList = append(task.batchErrList, err)
task.locker.Unlock()
globals.SugarLogger.Infof("SeqTask.Run %s step:%d failed with error:%v", task.Name, i, err)
if !task.IsContinueWhenError {
if err != nil {
// globals.SugarLogger.Infof("SeqTask.Run %s step:%d failed with error:%v", task.Name, i, err)
if task.IsContinueWhenError {
task.locker.Lock()
task.batchErrList = append(task.batchErrList, err)
task.locker.Unlock()
} else {
taskErr = err
break
}
} else if result != nil {
@@ -54,6 +56,7 @@ func (task *SeqTask) Run() {
}
}
EndFor:
task.locker.Lock()
task.Result = taskResult
task.mainErr = taskErr