- 重构tasksch

This commit is contained in:
gazebo
2019-08-01 16:20:52 +08:00
parent 66fcd42fc6
commit 852fff6eff
5 changed files with 131 additions and 118 deletions

View File

@@ -1,8 +1,6 @@
package tasksch
import (
"time"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/globals"
@@ -57,29 +55,9 @@ func (task *SeqTask) Run() {
}
EndFor:
task.locker.Lock()
if taskErr != nil { // 如果有错误,肯定就是失败了
task.Status = TaskStatusFailed
} else {
if task.FinishedJobCount+task.FailedJobCount < task.TotalJobCount {
taskErr = ErrTaskIsCanceled
task.Status = TaskStatusCanceled
} else {
task.Status = TaskStatusFinished
}
}
if taskErr != nil {
task.OriginalErr = taskErr
task.Err = NewTaskError(task.Name, taskErr)
} else {
if len(task.batchErrList) > 0 {
task.OriginalErr = task.batchErrList[0]
}
task.Err = task.buildTaskErrFromBatchErrList()
}
task.Result = taskResult
task.TerminatedAt = time.Now()
task.mainErr = taskErr
task.locker.Unlock()
globals.SugarLogger.Debugf("SeqTask.Run %s, result:%v, err:%v", task.Name, taskResult, task.Err)
})
}