swarm/network/stream: fix syncer ticker leak (ethereum#485)

* swarm/network/stream: fix syncer ticker leak * swarm/network/stream: a better ticker stop for syncer SetNextBatch
nolash · May 3, 2018 · d3e4e30 · d3e4e30
1 parent 9b724de
commit d3e4e30
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go
@@ -98,6 +98,11 @@ func (s *SwarmSyncerServer) SetNextBatch(from, to uint64) ([]byte, uint64, uint6
 		to = math.MaxUint64
 	}
 	var ticker *time.Ticker
+	defer func() {
+		if ticker != nil {
+			ticker.Stop()
+		}
+	}()
 	var wait bool
 	for {
 		if wait {
@@ -124,9 +129,6 @@ func (s *SwarmSyncerServer) SetNextBatch(from, to uint64) ([]byte, uint64, uint6
 		}
 		wait = true
 	}
-	if wait {
-		ticker.Stop()
-	}
 
 	log.Trace("Swarm syncer offer batch", "po", s.po, "len", i, "from", from, "to", to, "current store count", s.db.CurrentBucketStorageIndex(s.po))
 	return batch, from, to, nil, nil