From 4e79d2d4d037e7c33ec3e63d58110668106de222 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 29 Sep 2017 04:29:29 -0500 Subject: remove jobs.Srv and other jobs-related globals (#7535) --- jobs/jobs.go | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'jobs/jobs.go') diff --git a/jobs/jobs.go b/jobs/jobs.go index 22d87e850..7e49b2f48 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -18,7 +18,7 @@ const ( CANCEL_WATCHER_POLLING_INTERVAL = 5000 ) -func CreateJob(jobType string, jobData map[string]string) (*model.Job, *model.AppError) { +func (srv *JobServer) CreateJob(jobType string, jobData map[string]string) (*model.Job, *model.AppError) { job := model.Job{ Id: model.NewId(), Type: jobType, @@ -31,23 +31,23 @@ func CreateJob(jobType string, jobData map[string]string) (*model.Job, *model.Ap return nil, err } - if result := <-Srv.Store.Job().Save(&job); result.Err != nil { + if result := <-srv.Store.Job().Save(&job); result.Err != nil { return nil, result.Err } return &job, nil } -func GetJob(id string) (*model.Job, *model.AppError) { - if result := <-Srv.Store.Job().Get(id); result.Err != nil { +func (srv *JobServer) GetJob(id string) (*model.Job, *model.AppError) { + if result := <-srv.Store.Job().Get(id); result.Err != nil { return nil, result.Err } else { return result.Data.(*model.Job), nil } } -func ClaimJob(job *model.Job) (bool, *model.AppError) { - if result := <-Srv.Store.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_PENDING, model.JOB_STATUS_IN_PROGRESS); result.Err != nil { +func (srv *JobServer) ClaimJob(job *model.Job) (bool, *model.AppError) { + if result := <-srv.Store.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_PENDING, model.JOB_STATUS_IN_PROGRESS); result.Err != nil { return false, result.Err } else { success := result.Data.(bool) @@ -55,25 +55,25 @@ func ClaimJob(job *model.Job) (bool, *model.AppError) { } } -func SetJobProgress(job *model.Job, progress int64) *model.AppError { +func (srv *JobServer) SetJobProgress(job *model.Job, progress int64) *model.AppError { job.Status = model.JOB_STATUS_IN_PROGRESS job.Progress = progress - if result := <-Srv.Store.Job().UpdateOptimistically(job, model.JOB_STATUS_IN_PROGRESS); result.Err != nil { + if result := <-srv.Store.Job().UpdateOptimistically(job, model.JOB_STATUS_IN_PROGRESS); result.Err != nil { return result.Err } else { return nil } } -func SetJobSuccess(job *model.Job) *model.AppError { - result := <-Srv.Store.Job().UpdateStatus(job.Id, model.JOB_STATUS_SUCCESS) +func (srv *JobServer) SetJobSuccess(job *model.Job) *model.AppError { + result := <-srv.Store.Job().UpdateStatus(job.Id, model.JOB_STATUS_SUCCESS) return result.Err } -func SetJobError(job *model.Job, jobError *model.AppError) *model.AppError { +func (srv *JobServer) SetJobError(job *model.Job, jobError *model.AppError) *model.AppError { if jobError == nil { - result := <-Srv.Store.Job().UpdateStatus(job.Id, model.JOB_STATUS_ERROR) + result := <-srv.Store.Job().UpdateStatus(job.Id, model.JOB_STATUS_ERROR) return result.Err } @@ -85,11 +85,11 @@ func SetJobError(job *model.Job, jobError *model.AppError) *model.AppError { jobError.Translate(utils.T) job.Data["error"] = jobError.Message + " (" + jobError.DetailedError + ")" - if result := <-Srv.Store.Job().UpdateOptimistically(job, model.JOB_STATUS_IN_PROGRESS); result.Err != nil { + if result := <-srv.Store.Job().UpdateOptimistically(job, model.JOB_STATUS_IN_PROGRESS); result.Err != nil { return result.Err } else { if !result.Data.(bool) { - if result := <-Srv.Store.Job().UpdateOptimistically(job, model.JOB_STATUS_CANCEL_REQUESTED); result.Err != nil { + if result := <-srv.Store.Job().UpdateOptimistically(job, model.JOB_STATUS_CANCEL_REQUESTED); result.Err != nil { return result.Err } else { if !result.Data.(bool) { @@ -102,19 +102,19 @@ func SetJobError(job *model.Job, jobError *model.AppError) *model.AppError { return nil } -func SetJobCanceled(job *model.Job) *model.AppError { - result := <-Srv.Store.Job().UpdateStatus(job.Id, model.JOB_STATUS_CANCELED) +func (srv *JobServer) SetJobCanceled(job *model.Job) *model.AppError { + result := <-srv.Store.Job().UpdateStatus(job.Id, model.JOB_STATUS_CANCELED) return result.Err } -func RequestCancellation(jobId string) *model.AppError { - if result := <-Srv.Store.Job().UpdateStatusOptimistically(jobId, model.JOB_STATUS_PENDING, model.JOB_STATUS_CANCELED); result.Err != nil { +func (srv *JobServer) RequestCancellation(jobId string) *model.AppError { + if result := <-srv.Store.Job().UpdateStatusOptimistically(jobId, model.JOB_STATUS_PENDING, model.JOB_STATUS_CANCELED); result.Err != nil { return result.Err } else if result.Data.(bool) { return nil } - if result := <-Srv.Store.Job().UpdateStatusOptimistically(jobId, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_CANCEL_REQUESTED); result.Err != nil { + if result := <-srv.Store.Job().UpdateStatusOptimistically(jobId, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_CANCEL_REQUESTED); result.Err != nil { return result.Err } else if result.Data.(bool) { return nil @@ -123,7 +123,7 @@ func RequestCancellation(jobId string) *model.AppError { return model.NewAppError("Jobs.RequestCancellation", "jobs.request_cancellation.status.error", nil, "id="+jobId, http.StatusInternalServerError) } -func CancellationWatcher(ctx context.Context, jobId string, cancelChan chan interface{}) { +func (srv *JobServer) CancellationWatcher(ctx context.Context, jobId string, cancelChan chan interface{}) { for { select { case <-ctx.Done(): @@ -131,7 +131,7 @@ func CancellationWatcher(ctx context.Context, jobId string, cancelChan chan inte return case <-time.After(CANCEL_WATCHER_POLLING_INTERVAL * time.Millisecond): l4g.Debug("CancellationWatcher for Job: %v polling.", jobId) - if result := <-Srv.Store.Job().Get(jobId); result.Err == nil { + if result := <-srv.Store.Job().Get(jobId); result.Err == nil { jobStatus := result.Data.(*model.Job) if jobStatus.Status == model.JOB_STATUS_CANCEL_REQUESTED { close(cancelChan) @@ -152,16 +152,16 @@ func GenerateNextStartDateTime(now time.Time, nextStartTime time.Time) *time.Tim return &nextTime } -func CheckForPendingJobsByType(jobType string) (bool, *model.AppError) { - if result := <-Srv.Store.Job().GetCountByStatusAndType(model.JOB_STATUS_PENDING, jobType); result.Err != nil { +func (srv *JobServer) CheckForPendingJobsByType(jobType string) (bool, *model.AppError) { + if result := <-srv.Store.Job().GetCountByStatusAndType(model.JOB_STATUS_PENDING, jobType); result.Err != nil { return false, result.Err } else { return result.Data.(int64) > 0, nil } } -func GetLastSuccessfulJobByType(jobType string) (*model.Job, *model.AppError) { - if result := <-Srv.Store.Job().GetNewestJobByStatusAndType(model.JOB_STATUS_SUCCESS, jobType); result.Err != nil { +func (srv *JobServer) GetLastSuccessfulJobByType(jobType string) (*model.Job, *model.AppError) { + if result := <-srv.Store.Job().GetNewestJobByStatusAndType(model.JOB_STATUS_SUCCESS, jobType); result.Err != nil { return nil, result.Err } else { return result.Data.(*model.Job), nil -- cgit v1.2.3-1-g7c22