fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-23 17:51:39 +00:00
Code Issues Projects Releases Wiki Activity

errcheck: PR comment fixes

Browse Source
This commit is contained in:
Zach Ramsay
2017-09-21 09:55:06 -04:00
committed by Ethan Buchman
parent b3c5933a23
commit b75d4f73e7
12 changed files with 34 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rpc/lib/client/http_client.go
View File

@ -93,12 +93,8 @@ func (c *JSONRPCClient) Call(method string, params map[string]interface{}, resul
if err != nil {
return nil, err
}
defer func() {
if err := httpResponse.Body.Close(); err != nil {
panic(err)
return
}
}()
defer httpResponse.Body.Close()
responseBytes, err := ioutil.ReadAll(httpResponse.Body)
if err != nil {
return nil, err
@ -133,12 +129,8 @@ func (c *URIClient) Call(method string, params map[string]interface{}, result in
if err != nil {
return nil, err
}
defer func() {
if err := resp.Body.Close(); err != nil {
panic(err)
return
}
}()
defer resp.Body.Close()
responseBytes, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err

10
rpc/lib/client/ws_client.go
View File

@ -291,7 +291,7 @@ func (c *WSClient) processBacklog() error {
case request := <-c.backlog:
if c.writeWait > 0 {
if err := c.conn.SetWriteDeadline(time.Now().Add(c.writeWait)); err != nil {
panic(err)
c.Logger.Error("failed to set write deadline", "err", err)
}
}
if err := c.conn.WriteJSON(request); err != nil {
@ -363,7 +363,7 @@ func (c *WSClient) writeRoutine() {
case request := <-c.send:
if c.writeWait > 0 {
if err := c.conn.SetWriteDeadline(time.Now().Add(c.writeWait)); err != nil {
panic(err)
c.Logger.Error("failed to set write deadline", "err", err)
}
}
if err := c.conn.WriteJSON(request); err != nil {
@ -376,7 +376,7 @@ func (c *WSClient) writeRoutine() {
case <-ticker.C:
if c.writeWait > 0 {
if err := c.conn.SetWriteDeadline(time.Now().Add(c.writeWait)); err != nil {
panic(err)
c.Logger.Error("failed to set write deadline", "err", err)
}
}
if err := c.conn.WriteMessage(websocket.PingMessage, []byte{}); err != nil {
@ -392,7 +392,7 @@ func (c *WSClient) writeRoutine() {
return
case <-c.Quit:
if err := c.conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")); err != nil {
panic(err)
c.Logger.Error("failed to write message", "err", err)
}
return
}
@ -424,7 +424,7 @@ func (c *WSClient) readRoutine() {
// reset deadline for every message type (control or data)
if c.readWait > 0 {
if err := c.conn.SetReadDeadline(time.Now().Add(c.readWait)); err != nil {
panic(err)
c.Logger.Error("failed to set read deadline", "err", err)
}
}
_, data, err := c.conn.ReadMessage()

9
rpc/lib/server/handlers.go
View File

@ -534,6 +534,7 @@ func (wsc *wsConnection) readRoutine() {
}
}
}()
defer wsc.baseConn.Close()
wsc.baseConn.SetPongHandler(func(m string) error {
return wsc.baseConn.SetReadDeadline(time.Now().Add(wsc.readWait))
@ -546,7 +547,7 @@ func (wsc *wsConnection) readRoutine() {
default:
// reset deadline for every type of message (control or data)
if err := wsc.baseConn.SetReadDeadline(time.Now().Add(wsc.readWait)); err != nil {
panic(err)
wsc.Logger.Error("failed to set read deadline", "err", err)
}
var in []byte
_, in, err := wsc.baseConn.ReadMessage()
@ -619,9 +620,7 @@ func (wsc *wsConnection) writeRoutine() {
pingTicker := time.NewTicker(wsc.pingPeriod)
defer func() {
pingTicker.Stop()
if err := wsc.baseConn.Close(); err != nil {
panic(err)
}
wsc.baseConn.Close()
}()
// https://github.com/gorilla/websocket/issues/97
@ -781,6 +780,6 @@ func writeListOfEndpoints(w http.ResponseWriter, r *http.Request, funcMap map[st
w.WriteHeader(200)
_, err := w.Write(buf.Bytes())
if err != nil {
panic(err)
// ignore error
}
}

4
rpc/lib/server/http_server.go
View File

@ -58,7 +58,7 @@ func WriteRPCResponseHTTPError(w http.ResponseWriter, httpCode int, res types.RP
w.WriteHeader(httpCode)
_, err = w.Write(jsonBytes)
if err != nil {
panic(err)
// ignore error
}
}
@ -71,7 +71,7 @@ func WriteRPCResponseHTTP(w http.ResponseWriter, res types.RPCResponse) {
w.WriteHeader(200)
_, err = w.Write(jsonBytes)
if err != nil {
panic(err)
// ignore error
}
}