Catch more error to avoid dead lock at project close

This commit is contained in:
Julien Duponchelle committed 2016-08-29 18:59:13 +02:00
1 parent 96f3cb0445
commit 919355abd8
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -347,7 +347,7 @@ class Compute:
if not self._connected and not self._closed:
try:
response = yield from self._run_http_query("GET", "/capabilities")
except (aiohttp.errors.ClientOSError, aiohttp.errors.ClientRequestError):
except (aiohttp.errors.ClientOSError, aiohttp.errors.ClientRequestError, aiohttp.ClientResponseError):
# Try to reconnect after 2 seconds if server unavailable
asyncio.get_event_loop().call_later(2, lambda: asyncio.async(self.connect()))
return
+1 -1
View File
@@ -342,7 +342,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:
except (aiohttp.errors.ClientOSError, aiohttp.web.HTTPNotFound, aiohttp.web.HTTPConflict):
pass
@asyncio.coroutine
+1 -1
View File
@@ -497,7 +497,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:
except (aiohttp.errors.ClientOSError, aiohttp.web.HTTPNotFound, aiohttp.web.HTTPConflict):
pass
self._cleanPictures()
self._status = "closed"