tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core, p2p/discv5: use time.NewTicker instead of time.Tick (#15747)

Browse Source
This commit is contained in:
ferhat elmas 2018-01-02 12:50:46 +01:00 committed by Felix Lange
parent c495bca4ad
commit 5866626b08
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/blockchain.go
View File

@ -1196,10 +1196,11 @@ func (bc *BlockChain) PostChainEvents(events []interface{}, logs []*types.Log) {
} }
func (bc *BlockChain) update() { func (bc *BlockChain) update() {
futureTimer := time.Tick(5 * time.Second) futureTimer := time.NewTicker(5 * time.Second)
defer futureTimer.Stop()
for { for {
select { select {
case <-futureTimer: case <-futureTimer.C:
bc.procFutureBlocks() bc.procFutureBlocks()
case <-bc.quit: case <-bc.quit:
return return

6
p2p/discv5/database.go
View File

@ -239,14 +239,14 @@ func (db *nodeDB) ensureExpirer() {
// expirer should be started in a go routine, and is responsible for looping ad // expirer should be started in a go routine, and is responsible for looping ad
// infinitum and dropping stale data from the database. // infinitum and dropping stale data from the database.
func (db *nodeDB) expirer() { func (db *nodeDB) expirer() {
tick := time.Tick(nodeDBCleanupCycle) tick := time.NewTicker(nodeDBCleanupCycle)
defer tick.Stop()
for { for {
select { select {
case <-tick: case <-tick.C:
if err := db.expireNodes(); err != nil { if err := db.expireNodes(); err != nil {
log.Error(fmt.Sprintf("Failed to expire nodedb items: %v", err)) log.Error(fmt.Sprintf("Failed to expire nodedb items: %v", err))
} }
case <-db.quit: case <-db.quit:
return return
} }