- 整理tasksch

business/jxutils/tasksch/parallel_task.go

@@ -118,19 +118,18 @@ func (task *ParallelTask) Run() {
 								})
 								// globals.SugarLogger.Debugf("ParallelTask.Run %s, after call worker result:%v, err:%v", task.Name, result, err)
 								task.finishedOneJob(len(job), err)
-								if err == nil {
-									if result != nil {
-										retVal = append(retVal, utils.Interface2Slice(result)...)
-									}
-								} else {
-									globals.SugarLogger.Infof("ParallelTask.Run %s, subtask(job:%s, params:%s) result:%v, failed with error:%v", task.Name, utils.Format4Output(job, true), utils.Format4Output(task.params, true), result, err)
-									task.locker.Lock()
-									task.batchErrList = append(task.batchErrList, err)
-									task.locker.Unlock()
-									if !task.IsContinueWhenError { // 出错
+								if err != nil { // 出错
+									// globals.SugarLogger.Infof("ParallelTask.Run %s, subtask(job:%s, params:%s) result:%v, failed with error:%v", task.Name, utils.Format4Output(job, true), utils.Format4Output(task.params, true), result, err)
+									if task.IsContinueWhenError {
+										task.locker.Lock()
+										task.batchErrList = append(task.batchErrList, err)
+										task.locker.Unlock()
+									} else {
 										chanRetVal = err
 										goto end
 									}
+								} else if result != nil {
+									retVal = append(retVal, utils.Interface2Slice(result)...)
 								}
 							}
 						}
@@ -165,6 +164,7 @@ func (task *ParallelTask) Run() {
 				taskResult = append(taskResult, resultList...)
 			}
 		}
+
 		task.locker.Lock()
 		task.Result = taskResult
 		task.mainErr = taskErr
@@ -172,7 +172,6 @@ func (task *ParallelTask) Run() {
 
 		close(task.subFinishChan)
 		task.jobList = nil // 如果不释放，任务被管理的话，会导致内存不能释放
-
 	})
 }