diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-13 13:53:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 13:53:37 -0500 |
| commit | 97558f6a6ec4c53fa69035fb430ead209d9c222d (patch) | |
| tree | 6fc57f5b75b15a025348c6e295cea6aedb9e69ae /api/general.go | |
| parent | 07bad4d6d518a9012a20fec8309cd625f57c7a8c (diff) | |
| download | chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.gz chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.bz2 chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.zip | |
PLT-4938 Add app package and move logic over from api package (#4931)
* Add app package and move logic over from api package
* Change app package functions to return errors
* Move non-api tests into app package
* Fix merge
Diffstat (limited to 'api/general.go')
| -rw-r--r-- | api/general.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/general.go b/api/general.go index 24855b821..5c8e45082 100644 --- a/api/general.go +++ b/api/general.go @@ -10,6 +10,7 @@ import ( l4g "github.com/alecthomas/log4go" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" ) @@ -21,7 +22,7 @@ func InitGeneral() { BaseRoutes.General.Handle("/log_client", ApiAppHandler(logClient)).Methods("POST") BaseRoutes.General.Handle("/ping", ApiAppHandler(ping)).Methods("GET") - BaseRoutes.WebSocket.Handle("ping", ApiWebSocketHandler(webSocketPing)) + app.Srv.WebSocketRouter.Handle("ping", ApiWebSocketHandler(webSocketPing)) } func getClientConfig(c *Context, w http.ResponseWriter, r *http.Request) { |