1 files changed, 14 insertions, 8 deletions
diff --git a/wsapi/api.go b/wsapi/api.go
index 4de0f265f..f318cba6f 100644
--- a/wsapi/api.go
+++ b/wsapi/api.go
@@ -7,15 +7,21 @@ import (
 	"github.com/mattermost/mattermost-server/app"
 )
 
-func InitRouter() {
-	app.Global().Srv.WebSocketRouter = app.NewWebSocketRouter()
+type API struct {
+	App    *app.App
+	Router *app.WebSocketRouter
 }
 
-func InitApi() {
-	InitUser()
-	InitSystem()
-	InitStatus()
-	InitWebrtc()
+func Init(a *app.App, router *app.WebSocketRouter) {
+	api := &API{
+		App:    a,
+		Router: router,
+	}
 
-	app.HubStart()
+	api.InitUser()
+	api.InitSystem()
+	api.InitStatus()
+	api.InitWebrtc()
+
+	a.HubStart()
 }