Release v2.1.11

CHANGELOG

@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.1.11 28/09/2018
+
+* Catch some exceptions.
+
 ## 2.1.10 15/09/2018
 
 * Include locale information and GNS3 VM version in crash reports.

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:

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)

gns3server/crash_report.py

@@ -57,7 +57,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://71472e2845b2422cab117bdfa8af55ec:da50c8f08b9f44d8b905356741c278df@sentry.io/38482"
+    DSN = "https://8a4a7325dfcf4661a0b04d92b0a7d32e:14f83f7a65e54df88e5f06abad85b152@sentry.io/38482"
     if hasattr(sys, "frozen"):
         cacert = get_resource("cacert.pem")
         if cacert is not None and os.path.isfile(cacert):

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

gns3server/version.py

@@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.1.10"
-__version_info__ = (2, 1, 10, 0)
+__version__ = "2.1.11"
+__version_info__ = (2, 1, 11, 0)
 
 # If it's a git checkout try to add the commit
 if "dev" in __version__: