mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-23 05:06:43 +00:00
eth: unsubscribe from subscriptions on error to prevent leaks
This commit is contained in:
parent
624503cdcf
commit
fa92c65545
2 changed files with 4 additions and 0 deletions
|
|
@ -103,6 +103,7 @@ func (api *FilterAPI) timeoutLoop(timeout time.Duration) {
|
|||
select {
|
||||
case <-ticker.C:
|
||||
case <-api.events.chainSub.Err():
|
||||
api.events.chainSub.Unsubscribe()
|
||||
return
|
||||
}
|
||||
api.filtersMu.Lock()
|
||||
|
|
@ -230,6 +231,7 @@ func (api *FilterAPI) NewBlockFilter() rpc.ID {
|
|||
api.filtersMu.Lock()
|
||||
delete(api.filters, headerSub.ID)
|
||||
api.filtersMu.Unlock()
|
||||
headerSub.Unsubscribe()
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
@ -415,6 +417,7 @@ func (api *FilterAPI) NewFilter(crit FilterCriteria) (rpc.ID, error) {
|
|||
api.filtersMu.Lock()
|
||||
delete(api.filters, logsSub.ID)
|
||||
api.filtersMu.Unlock()
|
||||
logsSub.Unsubscribe()
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@ func NewOracle(backend OracleBackend, params Config, startPrice *big.Int) *Oracl
|
|||
sub := backend.SubscribeChainHeadEvent(headEvent)
|
||||
if sub != nil { // the gasprice testBackend doesn't support subscribing to head events
|
||||
go func() {
|
||||
defer sub.Unsubscribe()
|
||||
var lastHead common.Hash
|
||||
for {
|
||||
select {
|
||||
|
|
|
|||
Loading…
Reference in a new issue