Fixed discovery busyloop when no bootnodes provided

This commit is contained in:
Yuriy Glukhov 2019-04-09 11:02:33 +03:00
parent b84c228364
commit 02843c0013
No known key found for this signature in database
GPG Key ID: 733560674BB43E6C
1 changed files with 14 additions and 11 deletions

View File

@ -420,18 +420,21 @@ proc bootstrap*(k: KademliaProtocol, bootstrapNodes: seq[Node], retries = 0) {.a
## Bond with bootstrap nodes and do initial lookup. Retry `retries` times ## Bond with bootstrap nodes and do initial lookup. Retry `retries` times
## in case of failure, or indefinitely if `retries` is 0. ## in case of failure, or indefinitely if `retries` is 0.
var numTries = 0 var numTries = 0
if bootstrapNodes.len != 0:
while true: while true:
let bonded = await all(bootstrapNodes.mapIt(k.bond(it))) let bonded = await all(bootstrapNodes.mapIt(k.bond(it)))
if true notin bonded: if true notin bonded:
info "Failed to bond with bootstrap nodes"
inc numTries inc numTries
if retries == 0 or numTries < retries: if retries == 0 or numTries < retries:
info "Retrying" info "Failed to bond with bootstrap nodes, retrying"
else: else:
info "Failed to bond with bootstrap nodes"
return return
else: else:
break break
discard await k.lookupRandom() discard await k.lookupRandom()
else:
info "Skipping discovery bootstrap, no bootnodes provided"
proc recvPong*(k: KademliaProtocol, n: Node, token: seq[byte]) = proc recvPong*(k: KademliaProtocol, n: Node, token: seq[byte]) =
trace "<<< pong from ", n trace "<<< pong from ", n