- 整理tasksch

business/jxutils/tasksch/sequence_task.go

@@ -45,7 +45,7 @@ func (task *SeqTask) Run() {
 			task.finishedOneJob(1, err)
 			if taskErr = err; taskErr != nil {
 				task.locker.Lock()
-				task.detailErrList = append(task.detailErrList, err)
+				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 {
@@ -60,7 +60,7 @@ func (task *SeqTask) Run() {
 		if taskErr != nil { // 如果有错误，肯定就是失败了
 			task.Status = TaskStatusFailed
 		} else {
-			if task.FinishedJobCount < task.TotalJobCount {
+			if task.FinishedJobCount+task.FailedJobCount < task.TotalJobCount {
 				taskErr = ErrTaskIsCanceled
 				task.Status = TaskStatusCanceled
 			} else {
@@ -71,10 +71,10 @@ func (task *SeqTask) Run() {
 			task.OriginalErr = taskErr
 			task.Err = NewTaskError(task.Name, taskErr)
 		} else {
-			if len(task.detailErrList) > 0 {
-				task.OriginalErr = task.detailErrList[0]
+			if len(task.batchErrList) > 0 {
+				task.OriginalErr = task.batchErrList[0]
 			}
-			task.Err = task.buildTaskErrFromDetail()
+			task.Err = task.buildTaskErrFromBatchErrList()
 		}
 		task.Result = taskResult
 		task.TerminatedAt = time.Now()