diff --git a/business/jxutils/tasksch/parallel_task.go b/business/jxutils/tasksch/parallel_task.go index e50944c3a..bab59065a 100644 --- a/business/jxutils/tasksch/parallel_task.go +++ b/business/jxutils/tasksch/parallel_task.go @@ -193,8 +193,7 @@ func (task *ParallelTask) Run() { task.Result = taskResult task.TerminatedAt = time.Now() task.locker.Unlock() - globals.SugarLogger.Debugf("ParallelTask.Run %s, err:%v", task.Name, taskErr) - // globals.SugarLogger.Debugf("ParallelTask.Run %s, result:%v, err:%v", task.Name, taskResult, taskErr) + globals.SugarLogger.Debugf("ParallelTask.Run %s, err:%v", task.Name, task.Err) close(task.subFinishChan) if task.resultHandler != nil { diff --git a/business/jxutils/tasksch/sequence_task.go b/business/jxutils/tasksch/sequence_task.go index d747286a0..a11a957c8 100644 --- a/business/jxutils/tasksch/sequence_task.go +++ b/business/jxutils/tasksch/sequence_task.go @@ -73,8 +73,7 @@ func (task *SeqTask) Run() { task.Result = taskResult task.TerminatedAt = time.Now() task.locker.Unlock() - - globals.SugarLogger.Debugf("SeqTask.Run %s, result:%v, err:%v", task.Name, taskResult, taskErr) + globals.SugarLogger.Debugf("SeqTask.Run %s, result:%v, err:%v", task.Name, taskResult, task.Err) }) } diff --git a/business/jxutils/tasksch/task.go b/business/jxutils/tasksch/task.go index f663056bb..8b4ada7be 100644 --- a/business/jxutils/tasksch/task.go +++ b/business/jxutils/tasksch/task.go @@ -67,7 +67,11 @@ func (t *TaskError) MarshalJSON() ([]byte, error) { } func (t *TaskError) Error() string { - return fmt.Sprintf("任务[%s]执行失败,错误详情:\n%s", t.name, t.errStr) + return fmt.Sprintf("[%s], 错误:%s", t.name, t.errStr) +} + +func (t *TaskError) String() string { + return t.Error() } func NewTaskError(name string, err error) *TaskError { @@ -340,7 +344,7 @@ func (t *BaseTask) setStatus(status int) { func (t *BaseTask) buildTaskErrFromDetail() (err error) { if len(t.detailErrMsgList) > 0 { - return NewTaskError(t.Name, fmt.Errorf("设置了错误继续标志,部分操作失败,总任务数:%d,失败数:%d,以下为详情:\n%s", t.TotalItemCount, t.FailedItemCount, strings.Join(t.detailErrMsgList, "\n"))) + return NewTaskError(t.Name, fmt.Errorf("总共:%d, 失败:%d, 详情:\n%s", t.TotalItemCount, t.FailedItemCount, strings.Join(t.detailErrMsgList, "\n"))) } return nil }