diff options
Diffstat (limited to 'jobs/jobs.go')
| -rw-r--r-- | jobs/jobs.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/jobs/jobs.go b/jobs/jobs.go index 6e1230291..a51780865 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -11,6 +11,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) const ( @@ -37,6 +38,14 @@ func CreateJob(jobType string, jobData map[string]string) (*model.Job, *model.Ap return &job, nil } +func 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 { return false, result.Err @@ -73,7 +82,8 @@ func SetJobError(job *model.Job, jobError *model.AppError) *model.AppError { if job.Data == nil { job.Data = make(map[string]string) } - job.Data["error"] = jobError.Error() + 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 { return result.Err |