[release/1.4.11] eth: cancel DAO challenge on peer drop (annoying log)

(cherry picked from commit 91f18ffd47d766b1493016da6802befbf9739709)
2016-07-19 12:00:09 +03:00 · 2016-07-19 12:00:09 +03:00 · 08a7cd74da
commit 08a7cd74da
parent 35d479b6d3
1 changed files with 7 additions and 0 deletions
--- a/eth/handler.go
+++ b/eth/handler.go
@ -295,6 +295,13 @@ func (pm *ProtocolManager) handle(p *peer) error {
 			glog.V(logger.Warn).Infof("%v: timed out DAO fork-check, dropping", p)
 			pm.removePeer(p.id)
 		})
+		// Make sure it's cleaned up if the peer dies off
+		defer func() {
+			if p.forkDrop != nil {
+				p.forkDrop.Stop()
+				p.forkDrop = nil
+			}
+		}()
 	}
 	// main loop. handle incoming messages.
 	for {