Remove app initialization from WebHub (#18687)
- Make it a Server method. - Pass Server instead of App. - Remove global app instance from NewServer, rather create local instances whenever needed. - Remove App from Websocket router, and create dynamically on every request. - Remove HubStart and HubStop from App methods. - Explicitly using s.Log instead of the global logger to indicate dependency on Server. We could have passed the logger explicitly but it doesn't look ideal. ```release-note NONE ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
609fea0002
Коммит
d949bd1638
@@ -16,7 +16,6 @@ type webSocketHandler interface {
|
||||
}
|
||||
|
||||
type WebSocketRouter struct {
|
||||
app *App
|
||||
handlers map[string]webSocketHandler
|
||||
}
|
||||
|
||||
@@ -27,13 +26,13 @@ func (wr *WebSocketRouter) Handle(action string, handler webSocketHandler) {
|
||||
func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketRequest) {
|
||||
if r.Action == "" {
|
||||
err := model.NewAppError("ServeWebSocket", "api.web_socket_router.no_action.app_error", nil, "", http.StatusBadRequest)
|
||||
returnWebSocketError(wr.app, conn, r, err)
|
||||
returnWebSocketError(conn.App, conn, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
if r.Seq <= 0 {
|
||||
err := model.NewAppError("ServeWebSocket", "api.web_socket_router.bad_seq.app_error", nil, "", http.StatusBadRequest)
|
||||
returnWebSocketError(wr.app, conn, r, err)
|
||||
returnWebSocketError(conn.App, conn, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -48,7 +47,7 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque
|
||||
return
|
||||
}
|
||||
|
||||
session, err := wr.app.GetSession(token)
|
||||
session, err := conn.App.GetSession(token)
|
||||
if err != nil {
|
||||
conn.WebSocket.Close()
|
||||
return
|
||||
@@ -59,15 +58,15 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque
|
||||
|
||||
// TODO: Same logic to reconnect queue as api4/websocket.go
|
||||
|
||||
wr.app.HubRegister(conn)
|
||||
conn.App.HubRegister(conn)
|
||||
|
||||
wr.app.Srv().Go(func() {
|
||||
wr.app.SetStatusOnline(session.UserId, false)
|
||||
wr.app.UpdateLastActivityAtIfNeeded(*session)
|
||||
conn.App.Srv().Go(func() {
|
||||
conn.App.SetStatusOnline(session.UserId, false)
|
||||
conn.App.UpdateLastActivityAtIfNeeded(*session)
|
||||
})
|
||||
|
||||
resp := model.NewWebSocketResponse(model.StatusOk, r.Seq, nil)
|
||||
hub := wr.app.GetHubForUserId(conn.UserId)
|
||||
hub := conn.App.GetHubForUserId(conn.UserId)
|
||||
if hub == nil {
|
||||
return
|
||||
}
|
||||
@@ -78,14 +77,14 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque
|
||||
|
||||
if !conn.IsAuthenticated() {
|
||||
err := model.NewAppError("ServeWebSocket", "api.web_socket_router.not_authenticated.app_error", nil, "", http.StatusUnauthorized)
|
||||
returnWebSocketError(wr.app, conn, r, err)
|
||||
returnWebSocketError(conn.App, conn, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
handler, ok := wr.handlers[r.Action]
|
||||
if !ok {
|
||||
err := model.NewAppError("ServeWebSocket", "api.web_socket_router.bad_action.app_error", nil, "", http.StatusInternalServerError)
|
||||
returnWebSocketError(wr.app, conn, r, err)
|
||||
returnWebSocketError(conn.App, conn, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user