status-im/go-waku
2
0
Fork 0
mirror of https://github.com/status-im/go-waku.git synced 2025-02-27 12:30:39 +00:00
Code Issues Projects Releases Wiki Activity

fix: close iterator

Browse Source
This commit is contained in:
Richard Ramos 2023-01-31 10:45:19 -04:00 committed by RichΛrd
parent 5ff87d8e65
commit 6169a44c24
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
waku/v2/discv5/discover.go
View File

@ -256,7 +256,20 @@ func (d *DiscoveryV5) iterate(ctx context.Context) error {
return fmt.Errorf("obtaining iterator: %w", err)
}
defer iterator.Close()
closeCh := make(chan struct{}, 1)
defer close(closeCh)
// Closing iterator when context is cancelled or function is returning
d.wg.Add(1)
go func() {
defer d.wg.Done()
select {
case <-ctx.Done():
iterator.Close()
case <-closeCh:
iterator.Close()
}
}()
for {
if ctx.Err() != nil {

16
waku/v2/protocol/peer_exchange/waku_peer_exchange.go
View File

@ -317,7 +317,21 @@ func (wakuPX *WakuPeerExchange) iterate(ctx context.Context) error {
if err != nil {
return fmt.Errorf("obtaining iterator: %w", err)
}
defer iterator.Close()
closeCh := make(chan struct{}, 1)
defer close(closeCh)
// Closing iterator when context is cancelled or function is returning
wakuPX.wg.Add(1)
go func() {
defer wakuPX.wg.Done()
select {
case <-ctx.Done():
iterator.Close()
case <-closeCh:
iterator.Close()
}
}()
for {
if ctx.Err() != nil {