cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Lint fixes

Browse Source
This commit is contained in:
Łukasz Magiera 2019-07-15 18:32:43 +02:00
parent 3fca70f112
commit 661043f5c8
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jsonrpc/server.go
View File

@ -35,9 +35,13 @@ func (s *RPCServer) handleWS(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
defer c.Close()
handleWsConn(r.Context(), c, s.methods, nil, nil) handleWsConn(r.Context(), c, s.methods, nil, nil)
if err := c.Close(); err != nil {
log.Error(err)
return
}
} }
// TODO: return errors to clients per spec // TODO: return errors to clients per spec

4
lib/jsonrpc/websocket.go
View File

@ -137,11 +137,10 @@ func handleWsConn(ctx context.Context, conn *websocket.Conn, handler handlers, r
nw := func(cb func(io.Writer)) { nw := func(cb func(io.Writer)) {
cb(ioutil.Discard) cb(ioutil.Discard)
} }
done := func(){} done := cf
if frame.ID != nil { if frame.ID != nil {
nw = nextWriter nw = nextWriter
handlingLk.Lock() handlingLk.Lock()
handling[*frame.ID] = cf handling[*frame.ID] = cf
handlingLk.Unlock() handlingLk.Unlock()
@ -150,7 +149,6 @@ func handleWsConn(ctx context.Context, conn *websocket.Conn, handler handlers, r
handlingLk.Lock() handlingLk.Lock()
defer handlingLk.Unlock() defer handlingLk.Unlock()
cf := handling[*frame.ID]
cf() cf()
delete(handling, *frame.ID) delete(handling, *frame.ID)
} }