From d618f08275e5d0f065afa5922da01a7459405555 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Sun, 25 Feb 2024 07:47:43 -0500 Subject: [PATCH] refactor: rename RetryableTask to RetryableJob --- api/s5/s5.go | 4 ++-- cron/cron.go | 6 +++--- protocols/s5/tus.go | 2 +- renter/renter.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/s5/s5.go b/api/s5/s5.go index 2924587..24a4b10 100644 --- a/api/s5/s5.go +++ b/api/s5/s5.go @@ -806,8 +806,8 @@ func (s *S5API) accountPin(jc jape.Context) { jobName := fmt.Sprintf("pin-import-%s", cid64) if task := s.cron.GetJobByName(jobName); task == nil { - task := s.cron.RetryableTask( - cron.RetryableTaskParams{ + task := s.cron.RetryableJob( + cron.RetryableJobParams{ Name: jobName, Tags: nil, Function: s.pinImportCronTask, diff --git a/cron/cron.go b/cron/cron.go index b2b5b0f..905a54d 100644 --- a/cron/cron.go +++ b/cron/cron.go @@ -45,7 +45,7 @@ type CronServiceDefault struct { logger *zap.Logger } -type RetryableTaskParams struct { +type RetryableJobParams struct { Name string Tags []string Function any @@ -99,7 +99,7 @@ func (c *CronServiceDefault) RegisterService(service CronableService) { c.services = append(c.services, service) } -func (c *CronServiceDefault) RetryableTask(params RetryableTaskParams) CronJob { +func (c *CronServiceDefault) RetryableJob(params RetryableJobParams) CronJob { job := gocron.OneTimeJob(gocron.OneTimeJobStartImmediately()) if params.Attempt > 0 { @@ -128,7 +128,7 @@ func (c *CronServiceDefault) RetryableTask(params RetryableTaskParams) CronJob { taskRetry := params taskRetry.Attempt++ - retryTask := c.RetryableTask(taskRetry) + retryTask := c.RetryableJob(taskRetry) retryTask.JobId = jobID _, err = c.RerunJob(retryTask) diff --git a/protocols/s5/tus.go b/protocols/s5/tus.go index a705bd5..30741a9 100644 --- a/protocols/s5/tus.go +++ b/protocols/s5/tus.go @@ -251,7 +251,7 @@ func (t *TusHandler) ScheduleUpload(ctx context.Context, uploadID string) error return errors.New("upload not found") } - task := t.cron.RetryableTask(cron.RetryableTaskParams{ + task := t.cron.RetryableJob(cron.RetryableJobParams{ Name: "tusUpload", Function: t.uploadTask, Args: []interface{}{upload.Hash}, diff --git a/renter/renter.go b/renter/renter.go index 30df8e6..356bf2e 100644 --- a/renter/renter.go +++ b/renter/renter.go @@ -207,7 +207,7 @@ func (r *RenterDefault) UploadObjectMultipart(ctx context.Context, params *Multi partNumber := int(i + 1) - job := r.cron.RetryableTask(cron.RetryableTaskParams{ + job := r.cron.RetryableJob(cron.RetryableJobParams{ Name: fileName + "-part-" + strconv.FormatUint(i, 10), Function: func() error { reader, err := rf(uint(start), uint(end))