- SyncStoresCategory

- TaskError for json output.

business/jxutils/tasksch/parallel_task.go

@@ -43,7 +43,7 @@ func NewParallelConfig() *ParallelConfig {
 	return &ParallelConfig{
 		ParallelCount:       DefParallelCount,
 		BatchSize:           1,
-		IsContinueWhenError: false,
+		IsContinueWhenError: true,
 		ResultHandler:       nil,
 	}
 }
@@ -127,7 +127,7 @@ func (task *ParallelTask) Run() {
 										goto end
 									}
 									task.locker.Lock()
-									task.DetailErrList = append(task.DetailErrList, err)
+									task.DetailErrList = append(task.DetailErrList, NewTaskError(err))
 									task.locker.Unlock()
 								}
 							}
@@ -175,7 +175,7 @@ func (task *ParallelTask) Run() {
 				task.Status = TaskStatusFinished
 			}
 		}
-		task.Err = taskErr
+		task.Err = NewTaskError(taskErr)
 		task.Result = taskResult
 		task.TerminatedAt = time.Now()
 		task.locker.Unlock()

business/jxutils/tasksch/sequence_task.go

@@ -46,7 +46,7 @@ func (task *SeqTask) Run() {
 					break
 				}
 				task.locker.Lock()
-				task.DetailErrList = append(task.DetailErrList, err)
+				task.DetailErrList = append(task.DetailErrList, NewTaskError(err))
 				task.locker.Unlock()
 			} else if result != nil {
 				taskResult = append(taskResult, utils.Interface2Slice(result)...)
@@ -64,7 +64,7 @@ func (task *SeqTask) Run() {
 				task.Status = TaskStatusFinished
 			}
 		}
-		task.Err = taskErr
+		task.Err = NewTaskError(taskErr)
 		task.Result = taskResult
 		task.TerminatedAt = time.Now()
 		task.locker.Unlock()

business/jxutils/tasksch/task.go

@@ -43,6 +43,20 @@ type ITask interface {
 	json.Marshaler
 }
 
+type TaskError struct {
+	error
+}
+
+func (t *TaskError) MarshalJSON() ([]byte, error) {
+	return json.Marshal(t.Error())
+}
+
+func NewTaskError(err error) *TaskError {
+	return &TaskError{
+		err,
+	}
+}
+
 type BaseTask struct {
 	Name                string    `json:"name"`
 	ID                  string    `json:"id"`
@@ -61,10 +75,11 @@ type BaseTask struct {
 	FailedJobCount      int       `json:"failedJobCount"`
 	Status              int       `json:"status"`
 
-	Result        []interface{} `json:"result"`
-	Err           error         `json:"err"`
-	Children      TaskList      `json:"children"`
-	DetailErrList []error       `json:"detailErrList"`
+	Result   []interface{} `json:"result"`
+	Children TaskList      `json:"children"`
+
+	Err           error   `json:"err"`
+	DetailErrList []error `json:"detailErrList"`
 
 	finishChan chan int
 	C          <-chan int `json:"-"`

business/jxutils/tasksch/task_test.go

@@ -0,0 +1,14 @@
+package tasksch
+
+import (
+	"errors"
+	"fmt"
+	"testing"
+
+	"git.rosy.net.cn/baseapi/utils"
+)
+
+func TestTaskError(t *testing.T) {
+	err := NewTaskError(errors.New("hello"))
+	fmt.Println(utils.Format4Output(err, false))
+}