diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
| commit | 6f31d90e2f31ae597b83b2f845d5db938af8e38c (patch) | |
| tree | 81c59b83ffb033df92ff7fba5ffaf3ba5fe7a3cf /cmd/commands/server.go | |
| parent | 319d61123a0418ea9caa9510b8ad1e9a302c7b93 (diff) | |
| parent | 1f6c271b3bedd6656ae7155714423b1b39a669c1 (diff) | |
| download | chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.gz chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.bz2 chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'cmd/commands/server.go')
| -rw-r--r-- | cmd/commands/server.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/commands/server.go b/cmd/commands/server.go index 441eb82bc..0d354f08e 100644 --- a/cmd/commands/server.go +++ b/cmd/commands/server.go @@ -11,7 +11,6 @@ import ( "syscall" "time" - "github.com/mattermost/mattermost-server/api" "github.com/mattermost/mattermost-server/api4" "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/cmd" @@ -104,8 +103,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, interruptChan return serverErr } - api4.Init(a, a.Srv.Router, false) - api3 := api.Init(a, a.Srv.Router) + api := api4.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) web.NewWeb(a, a.Srv.Router) @@ -135,7 +133,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, interruptChan // If we allow testing then listen for manual testing URL hits if a.Config().ServiceSettings.EnableTesting { - manualtesting.Init(api3) + manualtesting.Init(api) } a.EnsureDiagnosticId() |