diff options
| author | George Goldberg <george@gberg.me> | 2017-09-01 16:42:02 +0100 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-01 11:42:02 -0400 |
| commit | e85b5fb98835fb952eb2ed55f81e79eb3ef361ec (patch) | |
| tree | abe78804cd5e1175954f74b811a6d6a7af089d0b /app/websocket_router.go | |
| parent | d9ec7d9240a508571904c22458222e2846c2b5b4 (diff) | |
| download | chat-e85b5fb98835fb952eb2ed55f81e79eb3ef361ec.tar.gz chat-e85b5fb98835fb952eb2ed55f81e79eb3ef361ec.tar.bz2 chat-e85b5fb98835fb952eb2ed55f81e79eb3ef361ec.zip | |
App: NewLocAppError -> NewAppError (#7327)
* App: NewLocAppError -> NewAppError
* Remove statuscode that got missed.
Diffstat (limited to 'app/websocket_router.go')
| -rw-r--r-- | app/websocket_router.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/websocket_router.go b/app/websocket_router.go index a189fb790..e8957e6b5 100644 --- a/app/websocket_router.go +++ b/app/websocket_router.go @@ -8,6 +8,7 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" + "net/http" ) type webSocketHandler interface { @@ -30,13 +31,13 @@ func (wr *WebSocketRouter) Handle(action string, handler webSocketHandler) { func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketRequest) { if r.Action == "" { - err := model.NewLocAppError("ServeWebSocket", "api.web_socket_router.no_action.app_error", nil, "") + err := model.NewAppError("ServeWebSocket", "api.web_socket_router.no_action.app_error", nil, "", http.StatusBadRequest) ReturnWebSocketError(conn, r, err) return } if r.Seq <= 0 { - err := model.NewLocAppError("ServeWebSocket", "api.web_socket_router.bad_seq.app_error", nil, "") + err := model.NewAppError("ServeWebSocket", "api.web_socket_router.bad_seq.app_error", nil, "", http.StatusBadRequest) ReturnWebSocketError(conn, r, err) return } @@ -75,14 +76,14 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque } if !conn.IsAuthenticated() { - err := model.NewLocAppError("ServeWebSocket", "api.web_socket_router.not_authenticated.app_error", nil, "") + err := model.NewAppError("ServeWebSocket", "api.web_socket_router.not_authenticated.app_error", nil, "", http.StatusUnauthorized) ReturnWebSocketError(conn, r, err) return } var handler webSocketHandler if h, ok := wr.handlers[r.Action]; !ok { - err := model.NewLocAppError("ServeWebSocket", "api.web_socket_router.bad_action.app_error", nil, "") + err := model.NewAppError("ServeWebSocket", "api.web_socket_router.bad_action.app_error", nil, "", http.StatusInternalServerError) ReturnWebSocketError(conn, r, err) return } else { |