catch general socket errors (like econnrefused) in commonly-used methods

This commit is contained in:
Jude Nelson
2018-02-19 18:32:17 -05:00
parent 3441b3ed65
commit f80c4ae7d4

View File

@@ -361,6 +361,11 @@ def ping(proxy=None, hostport=None):
resp = {'error': 'Connection to remote host timed out.'}
return resp
except socket.error as se:
log.error("Connection error {}".format(se.errno))
resp = {'error': 'Connection to remote host failed.'}
return resp
except Exception as ee:
if BLOCKSTACK_DEBUG:
log.exception(ee)
@@ -448,6 +453,11 @@ def getinfo(proxy=None, hostport=None):
resp = {'error': 'Connection to remote host timed out.'}
return resp
except socket.error as se:
log.error("Connection error {}".format(se.errno))
resp = {'error': 'Connection to remote host failed.'}
return resp
except Exception as ee:
if BLOCKSTACK_DEBUG:
log.exception(ee)
@@ -509,6 +519,11 @@ def get_zonefile_inventory(hostport, bit_offset, bit_count, timeout=30, my_hostp
resp = {'error': 'Connection to remote host timed out.'}
return resp
except socket.error as se:
log.error("Connection error {}".format(se.errno))
resp = {'error': 'Connection to remote host failed.'}
return resp
except Exception as ee:
if BLOCKSTACK_DEBUG:
log.exception(ee)
@@ -575,6 +590,11 @@ def get_atlas_peers(hostport, timeout=30, my_hostport=None, proxy=None):
resp = {'error': 'Connection to remote host timed out.'}
return resp
except socket.error as se:
log.error("Connection error {}".format(se.errno))
resp = {'error': 'Connection to remote host failed.'}
return resp
except Exception as ee:
if BLOCKSTACK_DEBUG:
log.exception(ee)
@@ -641,6 +661,11 @@ def atlas_peer_exchange(hostport, my_hostport, timeout=30, proxy=None):
resp = {'error': 'Connection to remote host timed out.'}
return resp
except socket.error as se:
log.error("Connection error {}".format(se.errno))
resp = {'error': 'Connection to remote host failed.'}
return resp
except Exception as ee:
if BLOCKSTACK_DEBUG:
log.exception(ee)