mirror of
https://github.com/alexgo-io/stacks-puppet-node.git
synced 2026-04-24 03:45:38 +08:00
catch general socket errors (like econnrefused) in commonly-used methods
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user