roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

rpc: reset writeConn when conn is closed on readErr (#20414)

Browse Source 
This change makes the client attempt to reconnect when a write fails.
We already had reconnect support, but the reconnect would previously
happen on the next call after an error. Being more eager leads to a
smoother experience overall.
This commit is contained in:
Zhou Zhiyao 2020-01-27 21:03:15 +08:00 committed by Felix Lange
parent 7b68975a00
commit 44c365c3e2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpc/client.go
View File

@ -465,7 +465,7 @@ func (c *Client) newMessage(method string, paramsIn ...interface{}) (*jsonrpcMes
func (c *Client) send(ctx context.Context, op *requestOp, msg interface{}) error { func (c *Client) send(ctx context.Context, op *requestOp, msg interface{}) error {
select { select {
case c.reqInit <- op: case c.reqInit <- op:
err := c.write(ctx, msg) err := c.write(ctx, msg, false)
c.reqSent <- err c.reqSent <- err
return err return err
case <-ctx.Done(): case <-ctx.Done():
@ -477,7 +477,7 @@ func (c *Client) send(ctx context.Context, op *requestOp, msg interface{}) error
} }
} }
func (c *Client) write(ctx context.Context, msg interface{}) error { func (c *Client) write(ctx context.Context, msg interface{}, retry bool) error {
// The previous write failed. Try to establish a new connection. // The previous write failed. Try to establish a new connection.
if c.writeConn == nil { if c.writeConn == nil {
if err := c.reconnect(ctx); err != nil { if err := c.reconnect(ctx); err != nil {
@ -487,6 +487,9 @@ func (c *Client) write(ctx context.Context, msg interface{}) error {
err := c.writeConn.writeJSON(ctx, msg) err := c.writeConn.writeJSON(ctx, msg)
if err != nil { if err != nil {
c.writeConn = nil c.writeConn = nil
if !retry {
return c.write(ctx, msg, true)
}
} }
return err return err
} }