- close quitChan when Cancel for tasksch.

business/jxutils/tasksch/parallel_task.go

@@ -112,23 +112,26 @@ func (task *ParallelTask) Run() {
 					select {
 					case <-task.quitChan: // 取消
 						goto end
-					case job := <-task.taskChan:
-						if job == nil { // 任务完成
-							chanRetVal = retVal
-							goto end
-						} else {
-							result, err := task.worker(task, job, task.params...)
-							// 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)...)
-								}
+					default:
+						select {
+						case job := <-task.taskChan:
+							if job == nil { // 任务完成
+								chanRetVal = retVal
+								goto end
 							} 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)
-								if !task.IsContinueWhenError { // 出错
-									chanRetVal = err
-									goto end
+								result, err := task.worker(task, job, task.params...)
+								// 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)
+									if !task.IsContinueWhenError { // 出错
+										chanRetVal = err
+										goto end
+									}
 								}
 							}
 						}
@@ -167,6 +170,9 @@ func (task *ParallelTask) Run() {
 		}
 
 		task.locker.Lock()
+		if task.Status != TaskStatusCanceling {
+			close(task.quitChan)
+		}
 		if taskErr != nil { // 如果有错误，肯定就是失败了
 			task.Status = TaskStatusFailed
 		} else {
@@ -186,7 +192,6 @@ func (task *ParallelTask) Run() {
 
 		close(task.finishChan)
 		close(task.subFinishChan)
-		close(task.quitChan)
 
 		if task.resultHandler != nil {
 			task.resultHandler(task.Name, taskResult, task.Err)