diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-09-24 13:27:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-24 13:27:31 +0200 |
commit | 9d73c79deff403dd9ac2d1476e1c5fdc282beafc (patch) | |
tree | 75461e60c15769806e6586dc6779dbcf10501ae6 /app/compliance.go | |
parent | 8898d7aab9565c48162c5cf16bfdf2f6f74cdb1e (diff) | |
download | chat-9d73c79deff403dd9ac2d1476e1c5fdc282beafc.tar.gz chat-9d73c79deff403dd9ac2d1476e1c5fdc282beafc.tar.bz2 chat-9d73c79deff403dd9ac2d1476e1c5fdc282beafc.zip |
Idiomatic error handling for app/c*.go (#9423)
Diffstat (limited to 'app/compliance.go')
-rw-r--r-- | app/compliance.go | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/app/compliance.go b/app/compliance.go index 5c62a49d9..d46e75b24 100644 --- a/app/compliance.go +++ b/app/compliance.go @@ -16,11 +16,11 @@ func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model return nil, model.NewAppError("GetComplianceReports", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented) } - if result := <-a.Srv.Store.Compliance().GetAll(page*perPage, perPage); result.Err != nil { + result := <-a.Srv.Store.Compliance().GetAll(page*perPage, perPage) + if result.Err != nil { return nil, result.Err - } else { - return result.Data.(model.Compliances), nil } + return result.Data.(model.Compliances), nil } func (a *App) SaveComplianceReport(job *model.Compliance) (*model.Compliance, *model.AppError) { @@ -30,15 +30,16 @@ func (a *App) SaveComplianceReport(job *model.Compliance) (*model.Compliance, *m job.Type = model.COMPLIANCE_TYPE_ADHOC - if result := <-a.Srv.Store.Compliance().Save(job); result.Err != nil { + result := <-a.Srv.Store.Compliance().Save(job) + if result.Err != nil { return nil, result.Err - } else { - job = result.Data.(*model.Compliance) - a.Go(func() { - a.Compliance.RunComplianceJob(job) - }) } + job = result.Data.(*model.Compliance) + a.Go(func() { + a.Compliance.RunComplianceJob(job) + }) + return job, nil } @@ -47,17 +48,17 @@ func (a *App) GetComplianceReport(reportId string) (*model.Compliance, *model.Ap return nil, model.NewAppError("downloadComplianceReport", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented) } - if result := <-a.Srv.Store.Compliance().Get(reportId); result.Err != nil { + result := <-a.Srv.Store.Compliance().Get(reportId) + if result.Err != nil { return nil, result.Err - } else { - return result.Data.(*model.Compliance), nil } + return result.Data.(*model.Compliance), nil } func (a *App) GetComplianceFile(job *model.Compliance) ([]byte, *model.AppError) { - if f, err := ioutil.ReadFile(*a.Config().ComplianceSettings.Directory + "compliance/" + job.JobName() + ".zip"); err != nil { + f, err := ioutil.ReadFile(*a.Config().ComplianceSettings.Directory + "compliance/" + job.JobName() + ".zip") + if err != nil { return nil, model.NewAppError("readFile", "api.file.read_file.reading_local.app_error", nil, err.Error(), http.StatusNotImplemented) - } else { - return f, nil } + return f, nil } |