aboutsummaryrefslogtreecommitdiffstats
path: root/eth/handler.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-04-29 19:47:26 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-04-29 19:47:26 +0800
commit764e81bf12bc45b00cec7db216e72d6396cf0c13 (patch)
tree4f995c9e736b2376dd63a469bd8a38fbc6751cd7 /eth/handler.go
parentbac4440e1751fd3b71f8271260d1c8af236d2cec (diff)
parent13364a2dcf08924605408ae0e9233ea8e51d37fb (diff)
downloaddexon-764e81bf12bc45b00cec7db216e72d6396cf0c13.tar
dexon-764e81bf12bc45b00cec7db216e72d6396cf0c13.tar.gz
dexon-764e81bf12bc45b00cec7db216e72d6396cf0c13.tar.bz2
dexon-764e81bf12bc45b00cec7db216e72d6396cf0c13.tar.lz
dexon-764e81bf12bc45b00cec7db216e72d6396cf0c13.tar.xz
dexon-764e81bf12bc45b00cec7db216e72d6396cf0c13.tar.zst
dexon-764e81bf12bc45b00cec7db216e72d6396cf0c13.zip
Merge pull request #825 from obscuren/develop
core: chain fork fix
Diffstat (limited to 'eth/handler.go')
-rw-r--r--eth/handler.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/eth/handler.go b/eth/handler.go
index d00d00f23..61149049e 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -163,6 +163,11 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
if peer.td.Cmp(pm.chainman.Td()) <= 0 {
return
}
+ // Check downloader if it's busy so it doesn't show the sync message
+ // for every attempty
+ if pm.downloader.IsBusy() {
+ return
+ }
glog.V(logger.Info).Infof("Synchronisation attempt using %s TD=%v\n", peer.id, peer.td)
// Get the hashes from the peer (synchronously)