From 323c2d6775c86c063e9048ef0e8605283f07cafb Mon Sep 17 00:00:00 2001
From: Zsolt Felfoldi <zsfelfoldi@gmail.com>
Date: Fri, 11 Nov 2016 03:16:46 +0100
Subject: les: add missing nil check and handle quit in findServers
---
les/handler.go | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'les/handler.go')
diff --git a/les/handler.go b/les/handler.go
index 44a0a1661..cf698d79c 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -236,7 +236,7 @@ func (pm *ProtocolManager) removePeer(id string) {
}
func (pm *ProtocolManager) findServers() {
- if pm.p2pServer == nil {
+ if pm.p2pServer == nil || pm.topicDisc == nil {
return
}
enodes := make(chan string, 100)
@@ -259,7 +259,10 @@ func (pm *ProtocolManager) findServers() {
}
}
}()
- time.Sleep(time.Second * 20)
+ select {
+ case <-time.After(time.Second * 20):
+ case <-pm.quitSync:
+ }
close(stop)
}
--
cgit v1.2.3