From 7803c1078563826126a567bd138e3bac60f14247 Mon Sep 17 00:00:00 2001 From: Domendra Singh Komra <142248999+azadDsync@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:20:54 +0530 Subject: [PATCH] Fix errcheck issues in server/channels/jobs/batch_report_worker.go (#28864) Co-authored-by: Ben Schumacher --- server/.golangci.yml | 1 - server/channels/jobs/batch_report_worker.go | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index 92e7313ad4..a566179c02 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -194,7 +194,6 @@ issues: channels/app/users/users_test.go|\ channels/app/web_broadcast_hooks_test.go|\ channels/app/webhook_test.go|\ - channels/jobs/batch_report_worker.go|\ channels/jobs/batch_worker_test.go|\ channels/jobs/helper_test.go|\ channels/jobs/hosted_purchase_screening/worker.go|\ diff --git a/server/channels/jobs/batch_report_worker.go b/server/channels/jobs/batch_report_worker.go index 30c369e2e9..120ebf3e85 100644 --- a/server/channels/jobs/batch_report_worker.go +++ b/server/channels/jobs/batch_report_worker.go @@ -78,7 +78,10 @@ func (worker *BatchReportWorker) doBatch(rctx *request.Context, job *model.Job) // We might be able to add progress for this type of job in the future // But for now we can just set to 0 - worker.jobServer.SetJobProgress(job, 0) + if err := worker.jobServer.SetJobProgress(job, 0); err != nil { + worker.logger.Error("Worker: Failed to set job progress", mlog.Err(err)) + return false + } return false } @@ -124,7 +127,9 @@ func (worker *BatchReportWorker) complete(rctx request.CTX, job *model.Job) erro } defer func() { - worker.app.CleanupReportChunks(worker.reportFormat, job.Id, fileCount) + if err := worker.app.CleanupReportChunks(worker.reportFormat, job.Id, fileCount); err != nil { + worker.logger.Error("Worker: Failed to cleanup report chunks", mlog.Err(err)) + } }() if appErr = worker.app.SendReportToUser(rctx, job, worker.reportFormat); appErr != nil {