Revision 2a52a064 lib/bootstrap.py
b/lib/bootstrap.py | ||
---|---|---|
511 | 511 |
votes = {} |
512 | 512 |
for node in results: |
513 | 513 |
nres = results[node] |
514 |
data = nres.data |
|
515 |
if nres.failed or not isinstance(data, (tuple, list)) or len(data) < 3: |
|
516 |
# here the rpc layer should have already logged errors |
|
514 |
data = nres.payload |
|
515 |
msg = nres.RemoteFailMsg() |
|
516 |
fail = False |
|
517 |
if msg: |
|
518 |
logging.warning("Error contacting node %s: %s", node, msg) |
|
519 |
fail = True |
|
520 |
elif not isinstance(data, (tuple, list)) or len(data) < 3: |
|
521 |
logging.warning("Invalid data received from node %s: %s", node, data) |
|
522 |
fail = True |
|
523 |
if fail: |
|
517 | 524 |
if None not in votes: |
518 | 525 |
votes[None] = 0 |
519 | 526 |
votes[None] += 1 |
Also available in: Unified diff