mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-23 23:38:21 +00:00
Prevent a dead lock when closing server
This commit is contained in:
parent
cfd74a8164
commit
8f6d24ae5e
@ -89,7 +89,7 @@ class Controller:
|
||||
try:
|
||||
yield from compute.close()
|
||||
# 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
|
||||
yield from self.gns3vm.exit_vm()
|
||||
self._computes = {}
|
||||
|
@ -389,7 +389,7 @@ class Node:
|
||||
try:
|
||||
yield from self.post("/stop")
|
||||
# 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
|
||||
|
||||
@asyncio.coroutine
|
||||
|
@ -531,7 +531,7 @@ class Project:
|
||||
try:
|
||||
yield from compute.post("/projects/{}/close".format(self._id))
|
||||
# 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
|
||||
self._cleanPictures()
|
||||
self._status = "closed"
|
||||
|
Loading…
Reference in New Issue
Block a user