status-im
/
nim-eth
mirror of https://github.com/status-im/nim-eth.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Seperate transport close exceptions in blockchain sync

This commit is contained in:
kdeme 2019-06-13 15:32:06 +02:00 committed by zah
parent 46255c31d1
commit f068a54312
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eth/p2p/blockchain_sync.nim
View File

@ -164,6 +164,8 @@ proc obtainBlocksFromPeer(syncCtx: SyncContext, peer: Peer) {.async.} =
if bestBlockNumber > syncCtx.endBlockNumber: if bestBlockNumber > syncCtx.endBlockNumber:
trace "New sync end block number", number = bestBlockNumber trace "New sync end block number", number = bestBlockNumber
syncCtx.endBlockNumber = bestBlockNumber syncCtx.endBlockNumber = bestBlockNumber
except TransportError:
debug "Transport got closed during obtainBlocksFromPeer"
except CatchableError: except CatchableError:
debug "Exception in getBestBlockNumber()", debug "Exception in getBestBlockNumber()",
exc = getCurrentException().name, exc = getCurrentException().name,
@ -215,6 +217,8 @@ proc obtainBlocksFromPeer(syncCtx: SyncContext, peer: Peer) {.async.} =
dataReceived = true dataReceived = true
else: else:
warn "Bodies len != headers.len", bodies = bodies.len, headers = workItem.headers.len warn "Bodies len != headers.len", bodies = bodies.len, headers = workItem.headers.len
except TransportError:
debug "Transport got closed during obtainBlocksFromPeer"
except CatchableError: except CatchableError:
# the success case sets `dataReceived`, so we can just fall back to the # the success case sets `dataReceived`, so we can just fall back to the
# failure path below. If we signal time-outs with exceptions such # failure path below. If we signal time-outs with exceptions such
@ -322,7 +326,12 @@ proc onPeerConnected(ctx: SyncContext, peer: Peer) =
let f = ctx.startSyncWithPeer(peer) let f = ctx.startSyncWithPeer(peer)
f.callback = proc(data: pointer) {.gcsafe.} = f.callback = proc(data: pointer) {.gcsafe.} =
if f.failed: if f.failed:
if f.error of TransportError:
debug "Transport got closed during startSyncWithPeer"
else:
error "startSyncWithPeer failed", msg = f.readError.msg, peer error "startSyncWithPeer failed", msg = f.readError.msg, peer
except TransportError:
debug "Transport got closed during startSyncWithPeer"
except CatchableError: except CatchableError:
debug "Exception in startSyncWithPeer()", debug "Exception in startSyncWithPeer()",
exc = getCurrentException().name, exc = getCurrentException().name,