diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-29 04:29:29 -0500 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-09-29 10:29:29 +0100 |
| commit | 4e79d2d4d037e7c33ec3e63d58110668106de222 (patch) | |
| tree | 038995734b4b78cf025b47d2320d7e324eb80e0c /api4 | |
| parent | cb33179998c682bf1e48795d449d85f92cec97f7 (diff) | |
| download | chat-4e79d2d4d037e7c33ec3e63d58110668106de222.tar.gz chat-4e79d2d4d037e7c33ec3e63d58110668106de222.tar.bz2 chat-4e79d2d4d037e7c33ec3e63d58110668106de222.zip | |
remove jobs.Srv and other jobs-related globals (#7535)
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/apitestlib.go | 5 | ||||
| -rw-r--r-- | api4/job.go | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index fad066ff8..301e312da 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -23,7 +23,6 @@ import ( "github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/wsapi" - "github.com/mattermost/mattermost-server/jobs" s3 "github.com/minio/minio-go" "github.com/minio/minio-go/pkg/credentials" ) @@ -76,8 +75,8 @@ func setupTestHelper(enterprise bool) *TestHelper { utils.License().Features.SetDefaults() } - if jobs.Srv.Store == nil { - jobs.Srv.Store = th.App.Srv.Store + if th.App.Jobs.Store == nil { + th.App.Jobs.Store = th.App.Srv.Store } th.Client = th.CreateClient() diff --git a/api4/job.go b/api4/job.go index 57c604361..138c76c8f 100644 --- a/api4/job.go +++ b/api4/job.go @@ -52,7 +52,7 @@ func createJob(c *Context, w http.ResponseWriter, r *http.Request) { return } - if job, err := app.CreateJob(job); err != nil { + if job, err := c.App.CreateJob(job); err != nil { c.Err = err return } else { @@ -109,7 +109,7 @@ func cancelJob(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := app.CancelJob(c.Params.JobId); err != nil { + if err := c.App.CancelJob(c.Params.JobId); err != nil { c.Err = err return } |