fix pullsync shutdown (#379)

f1a6def3 · acud · GitHub · 80ce35e6 · f1a6def3
Commit f1a6def3 authored Jun 25, 2020 by acud Committed by GitHub Jun 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

pullsync.go pkg/pullsync/pullsync.go +5 -2

No files found.
--- a/pkg/pullsync/pullsync.go
+++ b/pkg/pullsync/pullsync.go
@@ -218,12 +218,15 @@ func (s *Syncer) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) err
 	s.ruidMtx.Lock()
 	s.ruidCtx[ru.Ruid] = cancel
 	s.ruidMtx.Unlock()
-	defer func() {
+	cc := make(chan struct{})
+	defer close(cc)
+	go func() {
 		select {
 		case <-s.quit:
-			cancel()
 		case <-ctx.Done():
+		case <-cc:
 		}
+		cancel()
 		s.ruidMtx.Lock()
 		delete(s.ruidCtx, ru.Ruid)
 		s.ruidMtx.Unlock()