diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-08-01 16:55:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 16:55:18 +0200 |
| commit | d81a61398d01d839e70e2345da787e7ef89c0832 (patch) | |
| tree | a0702c7874ae31b487bb0b87dcce613edc1e53b9 /api4/job.go | |
| parent | 1f168263a2ff73ddee1193cccdeea533f6d501fe (diff) | |
| download | chat-d81a61398d01d839e70e2345da787e7ef89c0832.tar.gz chat-d81a61398d01d839e70e2345da787e7ef89c0832.tar.bz2 chat-d81a61398d01d839e70e2345da787e7ef89c0832.zip | |
Migrate all the api4 to handle errors in idiomatic way (#9143)
Diffstat (limited to 'api4/job.go')
| -rw-r--r-- | api4/job.go | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/api4/job.go b/api4/job.go index 864d21bbb..7addf123b 100644 --- a/api4/job.go +++ b/api4/job.go @@ -28,12 +28,13 @@ func getJob(c *Context, w http.ResponseWriter, r *http.Request) { return } - if job, err := c.App.GetJob(c.Params.JobId); err != nil { + job, err := c.App.GetJob(c.Params.JobId) + if err != nil { c.Err = err return - } else { - w.Write([]byte(job.ToJson())) } + + w.Write([]byte(job.ToJson())) } func createJob(c *Context, w http.ResponseWriter, r *http.Request) { @@ -48,13 +49,14 @@ func createJob(c *Context, w http.ResponseWriter, r *http.Request) { return } - if job, err := c.App.CreateJob(job); err != nil { + job, err := c.App.CreateJob(job) + if err != nil { c.Err = err return - } else { - w.WriteHeader(http.StatusCreated) - w.Write([]byte(job.ToJson())) } + + w.WriteHeader(http.StatusCreated) + w.Write([]byte(job.ToJson())) } func getJobs(c *Context, w http.ResponseWriter, r *http.Request) { @@ -67,12 +69,13 @@ func getJobs(c *Context, w http.ResponseWriter, r *http.Request) { return } - if jobs, err := c.App.GetJobsPage(c.Params.Page, c.Params.PerPage); err != nil { + jobs, err := c.App.GetJobsPage(c.Params.Page, c.Params.PerPage) + if err != nil { c.Err = err return - } else { - w.Write([]byte(model.JobsToJson(jobs))) } + + w.Write([]byte(model.JobsToJson(jobs))) } func getJobsByType(c *Context, w http.ResponseWriter, r *http.Request) { @@ -86,12 +89,13 @@ func getJobsByType(c *Context, w http.ResponseWriter, r *http.Request) { return } - if jobs, err := c.App.GetJobsByTypePage(c.Params.JobType, c.Params.Page, c.Params.PerPage); err != nil { + jobs, err := c.App.GetJobsByTypePage(c.Params.JobType, c.Params.Page, c.Params.PerPage) + if err != nil { c.Err = err return - } else { - w.Write([]byte(model.JobsToJson(jobs))) } + + w.Write([]byte(model.JobsToJson(jobs))) } func cancelJob(c *Context, w http.ResponseWriter, r *http.Request) { |