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

Prevent a dead lock when closing server

Browse Source
This commit is contained in:
Julien Duponchelle 2016-09-29 14:10:57 +02:00
parent cfd74a8164
commit 8f6d24ae5e
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/controller/__init__.py
View File

@ -89,7 +89,7 @@ class Controller:
try: try:
yield from compute.close() yield from compute.close()
# We don't care if a compute is down at this step # We don't care if a compute is down at this step
except aiohttp.errors.ClientOSError: except (aiohttp.errors.ClientOSError, aiohttp.web_exceptions.HTTPError):
pass pass
yield from self.gns3vm.exit_vm() yield from self.gns3vm.exit_vm()
self._computes = {} self._computes = {}

2
gns3server/controller/node.py
View File

@ -389,7 +389,7 @@ class Node:
try: try:
yield from self.post("/stop") yield from self.post("/stop")
# We don't care if a compute is down at this step # We don't care if a compute is down at this step
except (aiohttp.errors.ClientOSError, aiohttp.errors.ClientHttpProcessingError, aiohttp.web.HTTPNotFound, aiohttp.web.HTTPConflict): except (aiohttp.errors.ClientOSError, aiohttp.errors.ClientHttpProcessingError, aiohttp.web.HTTPError):
pass pass
@asyncio.coroutine @asyncio.coroutine

2
gns3server/controller/project.py
View File

@ -531,7 +531,7 @@ class Project:
try: try:
yield from compute.post("/projects/{}/close".format(self._id)) yield from compute.post("/projects/{}/close".format(self._id))
# We don't care if a compute is down at this step # We don't care if a compute is down at this step
except (aiohttp.errors.ClientOSError, aiohttp.web.HTTPNotFound, aiohttp.web.HTTPConflict): except (aiohttp.errors.ClientOSError, aiohttp.web.HTTPError):
pass pass
self._cleanPictures() self._cleanPictures()
self._status = "closed" self._status = "closed"