mirrors/btcd
1
0
Fork 0
mirror of https://github.com/btcsuite/btcd.git synced 2024-11-19 09:50:08 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2028 from yyforyongyu/catch-shutdown

Browse Source 
rpcclient: catch shutdown signal when sending RPC requests
This commit is contained in:
Olaoluwa Osuntokun 2023-09-05 10:09:01 -07:00 committed by GitHub
commit 80f5a0ffdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -40,3 +40,6 @@ coverage.txt
btcec/coverage.txt btcec/coverage.txt
btcutil/coverage.txt btcutil/coverage.txt
btcutil/psbt/coverage.txt btcutil/psbt/coverage.txt
# vim
*.swp

1
btcutil/go.sum
View File

@ -60,6 +60,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

17
rpcclient/infrastructure.go
View File

@ -761,9 +761,7 @@ out:
// handleSendPostMessage handles performing the passed HTTP request, reading the // handleSendPostMessage handles performing the passed HTTP request, reading the
// result, unmarshalling it, and delivering the unmarshalled result to the // result, unmarshalling it, and delivering the unmarshalled result to the
// provided response channel. // provided response channel.
func (c *Client) handleSendPostMessage(jReq *jsonRequest, func (c *Client) handleSendPostMessage(jReq *jsonRequest) {
shutdown chan struct{}) {
protocol := "http" protocol := "http"
if !c.config.DisableTLS { if !c.config.DisableTLS {
protocol = "https" protocol = "https"
@ -825,7 +823,7 @@ func (c *Client) handleSendPostMessage(jReq *jsonRequest,
select { select {
case <-time.After(backoff): case <-time.After(backoff):
case <-shutdown: case <-c.shutdown:
return return
} }
} }
@ -893,7 +891,7 @@ out:
// is closed. // is closed.
select { select {
case jReq := <-c.sendPostChan: case jReq := <-c.sendPostChan:
c.handleSendPostMessage(jReq, c.shutdown) c.handleSendPostMessage(jReq)
case <-c.shutdown: case <-c.shutdown:
break out break out
@ -917,7 +915,6 @@ cleanup:
} }
c.wg.Done() c.wg.Done()
log.Tracef("RPC client send handler done for %s", c.config.Host) log.Tracef("RPC client send handler done for %s", c.config.Host)
} }
// sendPostRequest sends the passed HTTP request to the RPC server using the // sendPostRequest sends the passed HTTP request to the RPC server using the
@ -931,9 +928,13 @@ func (c *Client) sendPostRequest(jReq *jsonRequest) {
default: default:
} }
log.Tracef("Sending command [%s] with id %d", jReq.method, jReq.id) select {
case c.sendPostChan <- jReq:
log.Tracef("Sent command [%s] with id %d", jReq.method, jReq.id)
c.sendPostChan <- jReq case <-c.shutdown:
return
}
} }
// newFutureError returns a new future result channel that already has the // newFutureError returns a new future result channel that already has the