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

Catch GeneratorExit exception. Fixes #231.

Browse Source
This commit is contained in:
Jeremy 2015-07-25 16:46:23 -06:00
parent 64bf935222
commit 382747a2f2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/base_manager.py
View File

@ -115,7 +115,7 @@ class BaseManager:
for future in done: for future in done:
try: try:
future.result() future.result()
except Exception as e: except (Exception, GeneratorExit) as e:
log.error("Could not close VM {}".format(e), exc_info=1) log.error("Could not close VM {}".format(e), exc_info=1)
continue continue

4
gns3server/modules/dynamips/__init__.py
View File

@ -130,7 +130,7 @@ class Dynamips(BaseManager):
for future in done: for future in done:
try: try:
future.result() future.result()
except Exception as e: except (Exception, GeneratorExit) as e:
log.error("Could not stop device hypervisor {}".format(e), exc_info=1) log.error("Could not stop device hypervisor {}".format(e), exc_info=1)
continue continue
@ -154,7 +154,7 @@ class Dynamips(BaseManager):
for future in done: for future in done:
try: try:
future.result() future.result()
except Exception as e: except (Exception, GeneratorExit) as e:
log.error("Could not delete device {}".format(e), exc_info=1) log.error("Could not delete device {}".format(e), exc_info=1)
@asyncio.coroutine @asyncio.coroutine

2
gns3server/modules/project.py
View File

@ -367,7 +367,7 @@ class Project:
for future in done: for future in done:
try: try:
future.result() future.result()
except Exception as e: except (Exception, GeneratorExit) as e:
log.error("Could not close VM or device {}".format(e), exc_info=1) log.error("Could not close VM or device {}".format(e), exc_info=1)
if cleanup and os.path.exists(self.path): if cleanup and os.path.exists(self.path):