ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-30 16:13:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Catch some exceptions.

Browse Source
This commit is contained in:
grossmj 2018-09-28 15:04:38 +02:00
parent 4efdefaf5a
commit 4d95e0b51f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/vpcs/vpcs_vm.py
View File

@ -315,7 +315,7 @@ class VPCSVM(BaseNode):
if sys.platform.startswith("win32"): if sys.platform.startswith("win32"):
try: try:
self._process.send_signal(signal.CTRL_BREAK_EVENT) self._process.send_signal(signal.CTRL_BREAK_EVENT)
except OSError: except (SystemError, OSError):
pass pass
else: else:
try: try:

10
gns3server/controller/compute.py
View File

@ -446,9 +446,13 @@ class Compute:
self._capabilities = response.json self._capabilities = response.json
if response.json["version"].split("-")[0] != __version__.split("-")[0]: if response.json["version"].split("-")[0] != __version__.split("-")[0]:
msg = "GNS3 controller version {} is not the same as compute server {} version {}".format(__version__, if self._name.startswith("GNS3 VM"):
self._name, msg = "GNS3 version {} is not the same as the GNS3 VM version {}. Please upgrade the GNS3 VM.".format(__version__,
response.json["version"]) response.json["version"])
else:
msg = "GNS3 controller version {} is not the same as compute server {} version {}".format(__version__,
self._name,
response.json["version"])
if __version_info__[3] == 0: if __version_info__[3] == 0:
# Stable release # Stable release
log.error(msg) log.error(msg)

2
gns3server/utils/asyncio/telnet_server.py
View File

@ -215,7 +215,7 @@ class AsyncioTelnetServer:
try: try:
writer.write_eof() writer.write_eof()
yield from writer.drain() yield from writer.drain()
except ConnectionError: except (AttributeError, ConnectionError):
continue continue
@asyncio.coroutine @asyncio.coroutine