forked from TrueCloudLab/neoneo-go
[#1] rpcclient: Fix ws-reader hang on sending a response
* `wsReader` may get blocked on sending to the response channel if receiver can't read the response out. * If `wsWriter` goroutine got an error or `wsClient` is going to get shut down, then `wsReader` should stop trying to send the response as it's not reasonable and this leads only to blocking. Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
This commit is contained in:
parent
594f716b3d
commit
5481339d69
1 changed files with 7 additions and 1 deletions
|
@ -601,7 +601,13 @@ readloop:
|
|||
connCloseErr = fmt.Errorf("unknown response channel for response %d", id)
|
||||
break readloop // Unknown response (unexpected response ID).
|
||||
}
|
||||
ch <- &rr.Response
|
||||
select {
|
||||
case <-c.writerDone:
|
||||
break readloop
|
||||
case <-c.shutdown:
|
||||
break readloop
|
||||
case ch <- &rr.Response:
|
||||
}
|
||||
} else {
|
||||
// Malformed response, neither valid request, nor valid response.
|
||||
connCloseErr = fmt.Errorf("malformed response")
|
||||
|
|
Loading…
Reference in a new issue