[incubator-devlake] branch main updated: refactor: improve the error message for pipeline and task (#3985)

[zhangliang2022]

This is an automated email from the ASF dual-hosted git repository.

zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new 43336666f refactor: improve the error message for pipeline and task 
(#3985)
43336666f is described below

commit 43336666ffb1df3c054cabd71a5ab5dc6bf72842
Author: mindlesscloud <liang.zh...@merico.dev>
AuthorDate: Tue Dec 20 20:29:54 2022 +0800

    refactor: improve the error message for pipeline and task (#3985)
---
 runner/run_task.go          | 2 +-
 services/pipeline_runner.go | 6 +-----
 services/task.go            | 8 +++++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/runner/run_task.go b/runner/run_task.go
index 1b4ef6a9c..768368958 100644
--- a/runner/run_task.go
+++ b/runner/run_task.go
@@ -85,7 +85,7 @@ func RunTask(
                        }
                        dbe := db.UpdateColumns(task, []dal.DalSet{
                                {ColumnName: "status", Value: 
models.TASK_FAILED},
-                               {ColumnName: "message", Value: 
lakeErr.Messages().Format()},
+                               {ColumnName: "message", Value: lakeErr.Error()},
                                {ColumnName: "finished_at", Value: finishedAt},
                                {ColumnName: "spent_seconds", Value: 
spentSeconds},
                                {ColumnName: "failed_sub_task", Value: 
subTaskName},
diff --git a/services/pipeline_runner.go b/services/pipeline_runner.go
index 2d61bb970..812b1123a 100644
--- a/services/pipeline_runner.go
+++ b/services/pipeline_runner.go
@@ -127,11 +127,7 @@ func runPipeline(pipelineId uint64) errors.Error {
        }
        if err != nil {
                dbPipeline.Status = models.TASK_FAILED
-               if lakeErr := errors.AsLakeErrorType(err); lakeErr != nil {
-                       dbPipeline.Message = lakeErr.Messages().Format()
-               } else {
-                       dbPipeline.Message = err.Error()
-               }
+               dbPipeline.Message = err.Error()
        } else {
                dbPipeline.Status = models.TASK_COMPLETED
                dbPipeline.Message = ""
diff --git a/services/task.go b/services/task.go
index f7e1eaa68..5484d48af 100644
--- a/services/task.go
+++ b/services/task.go
@@ -24,6 +24,7 @@ import (
        "fmt"
        "regexp"
        "strconv"
+       "strings"
        "sync"
 
        "github.com/apache/incubator-devlake/errors"
@@ -301,7 +302,12 @@ func RunTasksStandalone(parentLogger core.Logger, taskIds 
[]uint64) errors.Error
                }
        }
        if len(errs) > 0 {
-               err = errors.Default.Combine(errs)
+               var sb strings.Builder
+               for _, e := range errs {
+                       _, _ = sb.WriteString(e.Error())
+                       _, _ = sb.WriteString("\n")
+               }
+               err = errors.Default.New(sb.String())
        }
        return errors.Convert(err)
 }