LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Handle disconnecting clients properly.

Browse source 
Also, add logging for connecting and disconnecting clients.
This commit is contained in:
David Hill 2014-04-22 16:03:17 -04:00
parent 6b24abfdad
commit 6a908d63bc
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sockets.go
View file

@ -402,7 +402,7 @@ out:
// WSSendRecv is the handler for websocket client connections. It loops // WSSendRecv is the handler for websocket client connections. It loops
// forever (until disconnected), reading JSON-RPC requests and sending // forever (until disconnected), reading JSON-RPC requests and sending
// sending responses and notifications. // sending responses and notifications.
func (s *server) WSSendRecv(ws *websocket.Conn, authenticated bool) { func (s *server) WSSendRecv(ws *websocket.Conn, remoteAddr string, authenticated bool) {
// Add client context so notifications duplicated to each // Add client context so notifications duplicated to each
// client are received by this client. // client are received by this client.
recvQuit := make(chan struct{}) recvQuit := make(chan struct{})
@ -416,8 +416,11 @@ func (s *server) WSSendRecv(ws *websocket.Conn, authenticated bool) {
case <-recvQuit: case <-recvQuit:
case <-sendQuit: case <-sendQuit:
} }
log.Infof("Disconnected websocket client %s", remoteAddr)
close(cc.quit) close(cc.quit)
}() }()
log.Infof("New websocket client %s", remoteAddr)
NotifyBtcdConnection(cc.send) // TODO(jrick): clients should explicitly request this. NotifyBtcdConnection(cc.send) // TODO(jrick): clients should explicitly request this.
addClient <- cc addClient <- cc
@ -438,10 +441,9 @@ func (s *server) WSSendRecv(ws *websocket.Conn, authenticated bool) {
// Do not log error. // Do not log error.
default: default:
// Log warning if the client did not disconnect.
if err != io.EOF { if err != io.EOF {
log.Warnf("Cannot receive client websocket message: %v", log.Warnf("Websocket receive failed from client %s: %v",
err) remoteAddr, err)
} }
} }
close(recvQueueIn) close(recvQueueIn)
@ -492,8 +494,7 @@ out:
select { select {
case <-badAuth: case <-badAuth:
// Bad auth. Disconnect. // Bad auth. Disconnect.
log.Warnf("Disconnecting improperly authorized websocket client") log.Warnf("Disconnecting unauthorized websocket client %s", remoteAddr)
ws.Close()
break out break out
case m = <-cc.send: // sends from external writers. never closes. case m = <-cc.send: // sends from external writers. never closes.
@ -502,20 +503,23 @@ out:
// Nothing left to send. Return so the handler exits. // Nothing left to send. Return so the handler exits.
break out break out
} }
case <-cc.quit:
break out
} }
err := ws.SetWriteDeadline(time.Now().Add(deadline)) err := ws.SetWriteDeadline(time.Now().Add(deadline))
if err != nil { if err != nil {
log.Errorf("Cannot set write deadline: %v", err) log.Errorf("Cannot set write deadline on client %s: %v", remoteAddr, err)
break out break out
} }
err = websocket.Message.Send(ws, string(m)) err = websocket.Message.Send(ws, string(m))
if err != nil { if err != nil {
log.Infof("Cannot complete client websocket send: %v", err) log.Warnf("Websocket send failed to client %s: %v", remoteAddr, err)
break out break out
} }
} }
close(sendQuit) close(sendQuit)
log.Tracef("Leaving function WSSendRecv")
} }
// NotifyNewBlockChainHeight notifies all frontends of a new // NotifyNewBlockChainHeight notifies all frontends of a new
@ -562,7 +566,7 @@ func (s *server) Start() {
// client if the origin is unset. // client if the origin is unset.
wsServer := websocket.Server{ wsServer := websocket.Server{
Handler: websocket.Handler(func(ws *websocket.Conn) { Handler: websocket.Handler(func(ws *websocket.Conn) {
s.WSSendRecv(ws, authenticated) s.WSSendRecv(ws, r.RemoteAddr, authenticated)
}), }),
} }
wsServer.ServeHTTP(w, r) wsServer.ServeHTTP(w, r)