diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-02 03:50:56 -0500 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-10-02 09:50:56 +0100 |
| commit | 9bc7af0c5704bbf73f8240b4569d5ea215352e39 (patch) | |
| tree | b17ddafc83ab43ccdce2116e83358299a08a50a6 /cmd | |
| parent | b84736e9b6401df0c6eeab9950bef09458a6aefd (diff) | |
| download | chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.tar.gz chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.tar.bz2 chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.zip | |
Don't use global app for api / api4 tests (#7528)
* don't use global app for api / api4 tests
* put sleep back. we're gonna have to do some goroutine wrangling
* fix oauth test config assumptions
* jobs package, i'm comin' for you next
* app test fix
* try increasing sleep a little
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/platform/init.go | 2 | ||||
| -rw-r--r-- | cmd/platform/server.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/platform/init.go b/cmd/platform/init.go index 1683c9d49..2f41b2ad6 100644 --- a/cmd/platform/init.go +++ b/cmd/platform/init.go @@ -29,7 +29,7 @@ func initDBCommandContext(configFileLocation string) (*app.App, error) { utils.ConfigureCmdLineLog() - a := app.Global() + a := app.New() a.NewServer() a.InitStores() if model.BuildEnterpriseReady == "true" { diff --git a/cmd/platform/server.go b/cmd/platform/server.go index ec753c837..7ee7097e7 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -64,7 +64,9 @@ func runServer(configFileLocation string) { l4g.Error("Problem with file storage settings: " + err.Error()) } - a := app.Global() + a := app.New() + defer a.Shutdown() + a.NewServer() a.InitStores() a.Srv.Router = api.NewRouter() @@ -161,8 +163,6 @@ func runServer(configFileLocation string) { a.Jobs.StopSchedulers() a.Jobs.StopWorkers() - - a.StopServer() } func runSecurityJob(a *app.App) { |