fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-18 15:41:20 +00:00
Code Issues Projects Releases Wiki Activity

backlog must always have higher priority

Browse Source
This commit is contained in:
Anton Kaliaev
2017-08-08 19:02:47 -04:00
parent 797acbe911
commit 236489aecf
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,6 +247,24 @@ func (c *WSClient) startReadWriteRoutines() {
go c.writeRoutine()
}
func (c *WSClient) processBacklog() error {
select {
case request := <-c.backlog:
c.conn.SetWriteDeadline(time.Now().Add(writeWait))
err := c.conn.WriteJSON(request)
if err != nil {
c.Logger.Error("failed to resend request", "err", err)
c.reconnectAfter <- err
// requeue request
c.backlog <- request
return err
}
c.Logger.Info("resend a request", "req", request)
default:
}
return nil
}
func (c *WSClient) reconnectRoutine() {
for {
select {
@ -268,7 +286,10 @@ func (c *WSClient) reconnectRoutine() {
break LOOP
}
}
c.startReadWriteRoutines()
err = c.processBacklog()
if err == nil {
c.startReadWriteRoutines()
}
}
case <-c.Quit:
return
@ -288,17 +309,6 @@ func (c *WSClient) writeRoutine() {
for {
select {
case request := <-c.backlog:
c.conn.SetWriteDeadline(time.Now().Add(writeWait))
err := c.conn.WriteJSON(request)
if err != nil {
c.Logger.Error("failed to resend request", "err", err)
c.reconnectAfter <- err
// add request to the backlog, so we don't lose it
c.backlog <- request
return
}
c.Logger.Info("resend a request", "req", request)
case request := <-c.send:
c.conn.SetWriteDeadline(time.Now().Add(writeWait))
err := c.conn.WriteJSON(request)