diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-19 17:00:09 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-08-18 21:01:05 +0800 |
| commit | 08a7cd74da3f353b80ced16d1e2cf2d758606699 (patch) | |
| tree | d0f93f3ceafe585100914f186f33e4eaac78b077 | |
| parent | 35d479b6d3d793ef8b32b28a9f2cfc9f8b4a0670 (diff) | |
| download | go-tangerine-08a7cd74da3f353b80ced16d1e2cf2d758606699.tar go-tangerine-08a7cd74da3f353b80ced16d1e2cf2d758606699.tar.gz go-tangerine-08a7cd74da3f353b80ced16d1e2cf2d758606699.tar.bz2 go-tangerine-08a7cd74da3f353b80ced16d1e2cf2d758606699.tar.lz go-tangerine-08a7cd74da3f353b80ced16d1e2cf2d758606699.tar.xz go-tangerine-08a7cd74da3f353b80ced16d1e2cf2d758606699.tar.zst go-tangerine-08a7cd74da3f353b80ced16d1e2cf2d758606699.zip | |
[release/1.4.11] eth: cancel DAO challenge on peer drop (annoying log)
(cherry picked from commit 91f18ffd47d766b1493016da6802befbf9739709)
| -rw-r--r-- | eth/handler.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/eth/handler.go b/eth/handler.go index a498cd247..6a648d2e0 100644 --- 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 { |