diff --git a/gns3server/compute/vpcs/vpcs_vm.py b/gns3server/compute/vpcs/vpcs_vm.py index 6449bb94..787f36d4 100644 --- a/gns3server/compute/vpcs/vpcs_vm.py +++ b/gns3server/compute/vpcs/vpcs_vm.py @@ -315,7 +315,7 @@ class VPCSVM(BaseNode): if sys.platform.startswith("win32"): try: self._process.send_signal(signal.CTRL_BREAK_EVENT) - except OSError: + except (SystemError, OSError): pass else: try: diff --git a/gns3server/controller/compute.py b/gns3server/controller/compute.py index fe981241..8513bde5 100644 --- a/gns3server/controller/compute.py +++ b/gns3server/controller/compute.py @@ -446,9 +446,13 @@ class Compute: self._capabilities = response.json if response.json["version"].split("-")[0] != __version__.split("-")[0]: - msg = "GNS3 controller version {} is not the same as compute server {} version {}".format(__version__, - self._name, - response.json["version"]) + if self._name.startswith("GNS3 VM"): + msg = "GNS3 version {} is not the same as the GNS3 VM version {}. Please upgrade the GNS3 VM.".format(__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: # Stable release log.error(msg) diff --git a/gns3server/utils/asyncio/telnet_server.py b/gns3server/utils/asyncio/telnet_server.py index abed2e06..9223fc16 100644 --- a/gns3server/utils/asyncio/telnet_server.py +++ b/gns3server/utils/asyncio/telnet_server.py @@ -215,7 +215,7 @@ class AsyncioTelnetServer: try: writer.write_eof() yield from writer.drain() - except ConnectionError: + except (AttributeError, ConnectionError): continue @asyncio.coroutine