From efcf4c2c1f749e465bd1632a4f8e2a281e16a8d1 Mon Sep 17 00:00:00 2001 From: songjc <969378911@qq.com> Date: Mon, 4 Sep 2023 16:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/pkgs/mq/executor/task/task.go | 30 +++++++++---------- executor/internal/task/cache_move_package.go | 4 +-- executor/internal/task/pcm_scheduler_task.go | 4 +-- executor/internal/task/pcm_upload_img.go | 4 +-- .../internal/task/storage_create_package.go | 4 +-- .../internal/task/storage_load_package.go | 4 +-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/common/pkgs/mq/executor/task/task.go b/common/pkgs/mq/executor/task/task.go index 952c5d2..27e34c1 100644 --- a/common/pkgs/mq/executor/task/task.go +++ b/common/pkgs/mq/executor/task/task.go @@ -8,66 +8,66 @@ type TaskStatusConst interface { type ScheduleTaskStatus struct { Status string `json:"status"` - Err error `json:"err"` + Error string `json:"error"` PCMJobID int64 `json:"pcmJobID"` } -func NewScheduleTaskStatus(status string, err error, pcmJobID int64) ScheduleTaskStatus { +func NewScheduleTaskStatus(status string, err string, pcmJobID int64) ScheduleTaskStatus { return ScheduleTaskStatus{ Status: status, - Err: err, + Error: err, PCMJobID: pcmJobID, } } type UploadImageTaskStatus struct { Status string `json:"status"` - Err error `json:"err"` + Error string `json:"error"` ImageID int64 `json:"imageID"` } -func NewUploadImageTaskStatus(status string, err error, imageID int64) UploadImageTaskStatus { +func NewUploadImageTaskStatus(status string, err string, imageID int64) UploadImageTaskStatus { return UploadImageTaskStatus{ Status: status, - Err: err, + Error: err, ImageID: imageID, } } type CacheMovePackageTaskStatus struct { Status string `json:"status"` - Err error `json:"err"` + Error string `json:"error"` } -func NewCacheMovePackageTaskStatus(status string, err error) CacheMovePackageTaskStatus { +func NewCacheMovePackageTaskStatus(status string, err string) CacheMovePackageTaskStatus { return CacheMovePackageTaskStatus{ Status: status, - Err: err, + Error: err, } } type CreatePackageTaskStatus struct { Status string `json:"status"` - Err error `json:"err"` + Error string `json:"error"` PackageID int64 `json:"packageID"` } -func NewCreatePackageTaskStatus(status string, err error, packageID int64) CreatePackageTaskStatus { +func NewCreatePackageTaskStatus(status string, err string, packageID int64) CreatePackageTaskStatus { return CreatePackageTaskStatus{ Status: status, - Err: err, + Error: err, PackageID: packageID, } } type LoadPackageTaskStatus struct { Status string `json:"status"` - Err error `json:"err"` + Error string `json:"error"` } -func NewLoadPackageTaskStatus(status string, err error) LoadPackageTaskStatus { +func NewLoadPackageTaskStatus(status string, err string) LoadPackageTaskStatus { return LoadPackageTaskStatus{ Status: status, - Err: err, + Error: err, } } diff --git a/executor/internal/task/cache_move_package.go b/executor/internal/task/cache_move_package.go index 867303e..c7175e5 100644 --- a/executor/internal/task/cache_move_package.go +++ b/executor/internal/task/cache_move_package.go @@ -33,9 +33,9 @@ func (t *CacheMovePackage) Execute(task *task.Task[TaskContext], ctx TaskContext err := t.do(ctx) if err != nil { //TODO 若任务失败，上报的状态failed字段根据情况修改 - ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("failed", err)) + ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("failed", err.Error())) } else { - ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("completed", nil)) + ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("completed", "")) } ctx.reporter.ReportNow() diff --git a/executor/internal/task/pcm_scheduler_task.go b/executor/internal/task/pcm_scheduler_task.go index c0daa92..919316a 100644 --- a/executor/internal/task/pcm_scheduler_task.go +++ b/executor/internal/task/pcm_scheduler_task.go @@ -36,7 +36,7 @@ func (t *PCMScheduleTask) Execute(task *task.Task[TaskContext], ctx TaskContext, err := t.do(task.ID(), ctx) if err != nil { //TODO 若任务失败，上报的状态failed字段根据情况修改 - ctx.reporter.Report(task.ID(), exectsk.NewScheduleTaskStatus("failed", err, 0)) + ctx.reporter.Report(task.ID(), exectsk.NewScheduleTaskStatus("failed", err.Error(), 0)) } ctx.reporter.ReportNow() @@ -74,7 +74,7 @@ func (t *PCMScheduleTask) do(taskID string, ctx TaskContext) error { } if tsResp.Status != prevStatus { - ctx.reporter.Report(taskID, exectsk.NewScheduleTaskStatus(tsResp.Status, nil, resp.PCMJobID)) + ctx.reporter.Report(taskID, exectsk.NewScheduleTaskStatus(tsResp.Status, "", resp.PCMJobID)) } prevStatus = tsResp.Status diff --git a/executor/internal/task/pcm_upload_img.go b/executor/internal/task/pcm_upload_img.go index 6a0df37..cf52d03 100644 --- a/executor/internal/task/pcm_upload_img.go +++ b/executor/internal/task/pcm_upload_img.go @@ -31,7 +31,7 @@ func (t *PCMUploadImage) Execute(task *task.Task[TaskContext], ctx TaskContext, err := t.do(task.ID(), ctx) if err != nil { //TODO 若任务失败，上报的状态failed字段根据情况修改 - ctx.reporter.Report(task.ID(), exectsk.NewUploadImageTaskStatus("failed", err, 0)) + ctx.reporter.Report(task.ID(), exectsk.NewUploadImageTaskStatus("failed", err.Error(), 0)) } ctx.reporter.ReportNow() @@ -56,6 +56,6 @@ func (t *PCMUploadImage) do(taskID string, ctx TaskContext) error { } // TODO 根据接口result返回情况修改 - ctx.reporter.Report(taskID, exectsk.NewUploadImageTaskStatus(resp.Result, nil, resp.ImageID)) + ctx.reporter.Report(taskID, exectsk.NewUploadImageTaskStatus(resp.Result, "", resp.ImageID)) return nil } diff --git a/executor/internal/task/storage_create_package.go b/executor/internal/task/storage_create_package.go index b4e28e6..77e1b1a 100644 --- a/executor/internal/task/storage_create_package.go +++ b/executor/internal/task/storage_create_package.go @@ -40,7 +40,7 @@ func (t *StorageCreatePackage) Execute(task *task.Task[TaskContext], ctx TaskCon err := t.do(task.ID(), ctx) if err != nil { //TODO 若任务失败，上报的状态failed字段根据情况修改 - ctx.reporter.Report(task.ID(), exectsk.NewCreatePackageTaskStatus("failed", err, 0)) + ctx.reporter.Report(task.ID(), exectsk.NewCreatePackageTaskStatus("failed", err.Error(), 0)) } ctx.reporter.ReportNow() @@ -69,6 +69,6 @@ func (t *StorageCreatePackage) do(taskID string, ctx TaskContext) error { } // TODO 根据接口result返回情况修改 - ctx.reporter.Report(taskID, exectsk.NewCreatePackageTaskStatus("completed", nil, resp.PackageID)) + ctx.reporter.Report(taskID, exectsk.NewCreatePackageTaskStatus("completed", "", resp.PackageID)) return nil } diff --git a/executor/internal/task/storage_load_package.go b/executor/internal/task/storage_load_package.go index 7f850cc..f63d542 100644 --- a/executor/internal/task/storage_load_package.go +++ b/executor/internal/task/storage_load_package.go @@ -33,9 +33,9 @@ func (t *StorageLoadPackage) Execute(task *task.Task[TaskContext], ctx TaskConte err := t.do(ctx) if err != nil { //TODO 若任务失败，上报的状态failed字段根据情况修改 - ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("failed", err)) + ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("failed", err.Error())) } else { - ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("completed", nil)) + ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("completed", "")) } ctx.reporter.ReportNow()