diff options
| author | George Goldberg <george@gberg.me> | 2017-09-15 13:32:11 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-15 08:32:11 -0400 |
| commit | 2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d (patch) | |
| tree | 513dee966bfa8d3810ddf631df90270acd342e4f /model/websocket_client.go | |
| parent | 600beb5af3e35fd82a2b06995b67629d08fe0fe3 (diff) | |
| download | chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.gz chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.bz2 chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.zip | |
Model: NewLocAppError -> NewAppError (#7450)
Diffstat (limited to 'model/websocket_client.go')
| -rw-r--r-- | model/websocket_client.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/model/websocket_client.go b/model/websocket_client.go index 8c77e827c..e5c44dde8 100644 --- a/model/websocket_client.go +++ b/model/websocket_client.go @@ -5,6 +5,7 @@ package model import ( "encoding/json" + "net/http" "github.com/gorilla/websocket" ) @@ -30,7 +31,7 @@ type WebSocketClient struct { func NewWebSocketClient(url, authToken string) (*WebSocketClient, *AppError) { conn, _, err := websocket.DefaultDialer.Dial(url+API_URL_SUFFIX_V3+"/users/websocket", nil) if err != nil { - return nil, NewLocAppError("NewWebSocketClient", "model.websocket_client.connect_fail.app_error", nil, err.Error()) + return nil, NewAppError("NewWebSocketClient", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError) } client := &WebSocketClient{ @@ -55,7 +56,7 @@ func NewWebSocketClient(url, authToken string) (*WebSocketClient, *AppError) { func NewWebSocketClient4(url, authToken string) (*WebSocketClient, *AppError) { conn, _, err := websocket.DefaultDialer.Dial(url+API_URL_SUFFIX+"/websocket", nil) if err != nil { - return nil, NewLocAppError("NewWebSocketClient4", "model.websocket_client.connect_fail.app_error", nil, err.Error()) + return nil, NewAppError("NewWebSocketClient4", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError) } client := &WebSocketClient{ @@ -79,7 +80,7 @@ func (wsc *WebSocketClient) Connect() *AppError { var err error wsc.Conn, _, err = websocket.DefaultDialer.Dial(wsc.ConnectUrl, nil) if err != nil { - return NewLocAppError("Connect", "model.websocket_client.connect_fail.app_error", nil, err.Error()) + return NewAppError("Connect", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError) } wsc.EventChannel = make(chan *WebSocketEvent, 100) @@ -107,7 +108,7 @@ func (wsc *WebSocketClient) Listen() { var err error if _, rawMsg, err = wsc.Conn.ReadMessage(); err != nil { if !websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseNoStatusReceived) { - wsc.ListenError = NewLocAppError("NewWebSocketClient", "model.websocket_client.connect_fail.app_error", nil, err.Error()) + wsc.ListenError = NewAppError("NewWebSocketClient", "model.websocket_client.connect_fail.app_error", nil, err.Error(), http.StatusInternalServerError) } return |