ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-24 01:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename socket.error to OSError.

Browse Source 
Server shutdown management.
This commit is contained in:
grossmj
2014-04-06 11:37:34 -06:00
parent f4dd096a8b
commit 27379682df
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/modules/dynamips/dynamips_hypervisor.py
View File

@ -71,7 +71,7 @@ class DynamipsHypervisor(object):
self._socket = socket.create_connection((self._host,
self._port),
self._timeout)
except socket.error as e:
except OSError as e:
raise DynamipsError("Could not connect to server: {}".format(e))
try:
@ -362,7 +362,7 @@ class DynamipsHypervisor(object):
with socket.socket(socket.AF_INET, socket_type) as s:
s.bind((host, port)) # the port is available if bind is a success
return port
except socket.error as e:
except OSError as e:
if e.errno == errno.EADDRINUSE: # socket already in use
continue
else:
@ -428,7 +428,7 @@ class DynamipsHypervisor(object):
command = command.strip() + '\n'
log.debug("sending {}".format(command))
self.socket.sendall(command.encode('utf-8'))
except socket.error as e:
except OSError as e:
raise DynamipsError("Lost communication with {host}:{port} :{error}"
.format(host=self._host, port=self._port, error=e))
@ -439,7 +439,7 @@ class DynamipsHypervisor(object):
try:
chunk = self.socket.recv(1024) # match to Dynamips' buffer size
buf += chunk.decode("utf-8")
except socket.error as e:
except OSError as e:
raise DynamipsError("Communication timed out with {host}:{port} :{error}"
.format(host=self._host, port=self._port, error=e))

2
gns3server/modules/dynamips/hypervisor_manager.py
View File

@ -412,7 +412,7 @@ class HypervisorManager(object):
try:
with socket.create_connection((host, port), timeout):
pass
except socket.error as e:
except OSError as e:
last_exception = e
continue
connection_success = True