summaryrefslogtreecommitdiffstats
path: root/api/websocket_handler.go
diff options
context:
space:
mode:
Diffstat (limited to 'api/websocket_handler.go')
-rw-r--r--api/websocket_handler.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/api/websocket_handler.go b/api/websocket_handler.go
index 5a313fe13..95aad8fee 100644
--- a/api/websocket_handler.go
+++ b/api/websocket_handler.go
@@ -31,11 +31,17 @@ func (wh *webSocketHandler) ServeWebSocket(conn *WebConn, r *model.WebSocketRequ
if data, err = wh.handlerFunc(r); err != nil {
l4g.Error(utils.T("api.web_socket_handler.log.error"), "/api/v3/users/websocket", r.Action, r.Seq, r.Session.UserId, err.SystemMessage(utils.T), err.DetailedError)
err.DetailedError = ""
- conn.Send <- model.NewWebSocketError(r.Seq, err)
+ errResp := model.NewWebSocketError(r.Seq, err)
+ errResp.DoPreComputeJson()
+
+ conn.Send <- errResp
return
}
- conn.Send <- model.NewWebSocketResponse(model.STATUS_OK, r.Seq, data)
+ resp := model.NewWebSocketResponse(model.STATUS_OK, r.Seq, data)
+ resp.DoPreComputeJson()
+
+ conn.Send <- resp
}
func NewInvalidWebSocketParamError(action string, name string) *model.AppError {