diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-03-28 04:58:19 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-28 09:58:19 +0100 |
| commit | daca0d93f621bcb1daae149c178af0631bcd120a (patch) | |
| tree | 6127936c76dbc6fd20a7377385469980e5bd72e3 /cmd | |
| parent | ca8b8d1245026672b1a56d256bb8ff3c8bb1bba9 (diff) | |
| download | chat-daca0d93f621bcb1daae149c178af0631bcd120a.tar.gz chat-daca0d93f621bcb1daae149c178af0631bcd120a.tar.bz2 chat-daca0d93f621bcb1daae149c178af0631bcd120a.zip | |
Move WebSocket API to it's own package and add websocket v4 endpoint (#5881)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/platform/server.go | 3 | ||||
| -rw-r--r-- | cmd/platform/test.go | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index be14f7f1f..317129354 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -18,6 +18,7 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" "github.com/mattermost/platform/web" + "github.com/mattermost/platform/wsapi" "github.com/spf13/cobra" ) @@ -62,8 +63,10 @@ func runServer(configFileLocation string) { app.NewServer() app.InitStores() api.InitRouter() + wsapi.InitRouter() api4.InitApi(false) api.InitApi() + wsapi.InitApi() web.InitWeb() if model.BuildEnterpriseReady == "true" { diff --git a/cmd/platform/test.go b/cmd/platform/test.go index cf67d6702..cd548568f 100644 --- a/cmd/platform/test.go +++ b/cmd/platform/test.go @@ -13,6 +13,7 @@ import ( "github.com/mattermost/platform/api4" "github.com/mattermost/platform/app" "github.com/mattermost/platform/utils" + "github.com/mattermost/platform/wsapi" "github.com/spf13/cobra" "os/signal" "syscall" @@ -47,8 +48,10 @@ func webClientTestsCmdF(cmd *cobra.Command, args []string) error { initDBCommandContextCobra(cmd) utils.InitTranslations(utils.Cfg.LocalizationSettings) api.InitRouter() + wsapi.InitRouter() api4.InitApi(false) api.InitApi() + wsapi.InitApi() setupClientTests() app.StartServer() runWebClientTests() @@ -61,8 +64,10 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error { initDBCommandContextCobra(cmd) utils.InitTranslations(utils.Cfg.LocalizationSettings) api.InitRouter() + wsapi.InitRouter() api4.InitApi(false) api.InitApi() + wsapi.InitApi() setupClientTests() app.StartServer() |