From a390ca5f30e871715f28937a02e87fff050b0c75 Mon Sep 17 00:00:00 2001 From: Zsolt Felfoldi Date: Thu, 26 Jan 2017 02:52:59 +0100 Subject: les, cmd/util: disable topic discovery with --nodiscover --- les/serverpool.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'les') diff --git a/les/serverpool.go b/les/serverpool.go index 68e962c97..9735a718e 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -348,7 +348,9 @@ func (pool *serverPool) selectPeerWait(reqID uint64, canSend func(*peer) (bool, func (pool *serverPool) eventLoop() { lookupCnt := 0 var convTime mclock.AbsTime - pool.discSetPeriod <- time.Millisecond * 100 + if pool.discSetPeriod != nil { + pool.discSetPeriod <- time.Millisecond * 100 + } for { select { case entry := <-pool.timeout: @@ -393,12 +395,16 @@ func (pool *serverPool) eventLoop() { lookupCnt++ if pool.fastDiscover && (lookupCnt == 50 || time.Duration(mclock.Now()-convTime) > time.Minute) { pool.fastDiscover = false - pool.discSetPeriod <- time.Minute + if pool.discSetPeriod != nil { + pool.discSetPeriod <- time.Minute + } } } case <-pool.quit: - close(pool.discSetPeriod) + if pool.discSetPeriod != nil { + close(pool.discSetPeriod) + } pool.connWg.Wait() pool.saveNodes() pool.wg.Done() -- cgit