diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2018-05-16 13:43:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 13:43:22 -0400 |
| commit | 1f6c271b3bedd6656ae7155714423b1b39a669c1 (patch) | |
| tree | 9ce6390c237cc5f7c16d63addb4372033807cff8 /cmd/commands/server.go | |
| parent | 02f8c18f40cd0e973e4c75b751e8fcbbbd019728 (diff) | |
| download | chat-1f6c271b3bedd6656ae7155714423b1b39a669c1.tar.gz chat-1f6c271b3bedd6656ae7155714423b1b39a669c1.tar.bz2 chat-1f6c271b3bedd6656ae7155714423b1b39a669c1.zip | |
MM-8708 Remove api package (#8784)
* Remove api package
* Remove api dependency from cmd package
* Remove EnableAPIv3 setting
* Update web tests
* Add more websocket tests
* Move some ws and oauth tests to api4 package
* Move command tests into api4 package
* Test fixes
* Fix msg command test
* Add some app file tests
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() |