arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-25 08:18:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into unstable

Browse Source
This commit is contained in:
Julien Duponchelle 2015-11-12 10:55:19 +01:00
commit c7cc155b78
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,8 +267,8 @@ class DynamipsHypervisor:
self._writer.write(command.encode()) self._writer.write(command.encode())
yield from self._writer.drain() yield from self._writer.drain()
except OSError as e: except OSError as e:
raise DynamipsError("Lost communication with {host}:{port} :{error}, Dynamips process running: {run}" raise DynamipsError("Could not send Dynamips command '{command}' to {host}:{port}: {error}, process running: {run}"
.format(host=self._host, port=self._port, error=e, run=self.is_running())) .format(command=command.strip(), host=self._host, port=self._port, error=e, run=self.is_running()))
# Now retrieve the result # Now retrieve the result
data = [] data = []
@ -282,13 +282,19 @@ class DynamipsHypervisor:
# task has been canceled but continue to read # task has been canceled but continue to read
# any remaining data sent by the hypervisor # any remaining data sent by the hypervisor
continue continue
except ConnectionResetError as e:
# Sometimes WinError 64 (ERROR_NETNAME_DELETED) is returned here on Windows.
# These happen if connection reset is received before IOCP could complete
# a previous operation. Ignore and try again....
log.warning("Connection reset received while reading Dynamips response: {}".format(e))
continue
if not chunk: if not chunk:
raise DynamipsError("No data returned from {host}:{port}, Dynamips process running: {run}" raise DynamipsError("No data returned from {host}:{port}, Dynamips process running: {run}"
.format(host=self._host, port=self._port, run=self.is_running())) .format(host=self._host, port=self._port, run=self.is_running()))
buf += chunk.decode("utf-8", errors="ignore") buf += chunk.decode("utf-8", errors="ignore")
except OSError as e: except OSError as e:
raise DynamipsError("Lost communication with {host}:{port} :{error}, Dynamips process running: {run}" raise DynamipsError("Could not read response for '{command}' from {host}:{port}: {error}, process running: {run}"
.format(host=self._host, port=self._port, error=e, run=self.is_running())) .format(command=command.strip(), host=self._host, port=self._port, error=e, run=self.is_running()))
# If the buffer doesn't end in '\n' then we can't be done # If the buffer doesn't end in '\n' then we can't be done
try: try: