forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

event: improve fix for the goroutine leak in resubscribe

Browse source
This commit is contained in:
Felix Lange 2020-02-12 12:56:27 +01:00 committed by GitHub
parent da12747636
commit 5968e03e1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
event/subscription.go
View file

@ -143,9 +143,8 @@ func (s *resubscribeSub) loop() {
}
func (s *resubscribeSub) subscribe() Subscription {
subscribed := make(chan error, 1)
subscribed := make(chan error)
var sub Subscription
retry:
for {
s.lastTry = mclock.Now()
ctx, cancel := context.WithCancel(context.Background())
@ -157,19 +156,19 @@ retry:
select {
case err := <-subscribed:
cancel()
if err != nil {
// Subscribing failed, wait before launching the next try.
if s.backoffWait() {
return nil
if err == nil {
if sub == nil {
panic("event: ResubscribeFunc returned nil subscription and no error")
}
continue retry
return sub
}
if sub == nil {
panic("event: ResubscribeFunc returned nil subscription and no error")
// Subscribing failed, wait before launching the next try.
if s.backoffWait() {
return nil // unsubscribed during wait
}
return sub
case <-s.unsub:
cancel()
<-subscribed // avoid leaking the s.fn goroutine.
return nil
}
}