aboutsummaryrefslogtreecommitdiffstats
path: root/eth/sync.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-12 03:11:27 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-12 03:11:27 +0800
commit0bedf1c3760a1042171fdfde0f119acb683c43ec (patch)
tree2251978416ad615ee8ca5e465a5bf9ed5b74efed /eth/sync.go
parent59bc5412327469fd13534ee22eaeda91d79286f4 (diff)
parent48bd48876c02d1a08690b9604df09ef4bcf77838 (diff)
downloaddexon-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar
dexon-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.gz
dexon-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.bz2
dexon-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.lz
dexon-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.xz
dexon-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.zst
dexon-0bedf1c3760a1042171fdfde0f119acb683c43ec.zip
Merge pull request #918 from obscuren/cpu_miner_fixes
cmd/geth, miner, backend, xeth: Fixed miner threads to be settable
Diffstat (limited to 'eth/sync.go')
-rw-r--r--eth/sync.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/eth/sync.go b/eth/sync.go
index d955eaa50..00b571782 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -98,7 +98,8 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
case downloader.ErrTimeout:
glog.V(logger.Debug).Infof("Removing peer %v due to sync timeout", peer.id)
pm.removePeer(peer)
-
+ case downloader.ErrPendingQueue:
+ glog.V(logger.Debug).Infoln("Synchronisation aborted:", err)
default:
glog.V(logger.Warn).Infof("Synchronisation failed: %v", err)
}