arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
Code Issues Releases Wiki Activity

Forward 503 error

Browse Source
This commit is contained in:
Julien Duponchelle 2016-04-20 16:24:30 +02:00
parent f6593663b5
commit ee0f1eb5fb
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/controller/compute.py
View File

@ -57,8 +57,6 @@ class Compute:
if compute_id == "local" and Config.instance().get_section_config("Server")["local"] is False: if compute_id == "local" and Config.instance().get_section_config("Server")["local"] is False:
raise ComputeError("The local compute is started without --local") raise ComputeError("The local compute is started without --local")
asyncio.async(self._connect())
def __del__(self): def __del__(self):
self._session.close() self._session.close()
@ -131,6 +129,8 @@ class Compute:
def httpQuery(self, method, path, data=None): def httpQuery(self, method, path, data=None):
if not self._connected: if not self._connected:
yield from self._connect() yield from self._connect()
if not self._connected:
raise aiohttp.web.HTTPConflict(text="The server {} is not a GNS3 server".format(self._id))
response = yield from self._runHttpQuery(method, path, data=data) response = yield from self._runHttpQuery(method, path, data=data)
return response return response
@ -141,6 +141,7 @@ class Compute:
""" """
if not self._connected: if not self._connected:
response = yield from self._runHttpQuery("GET", "/version") response = yield from self._runHttpQuery("GET", "/version")
if "version" not in response.json: if "version" not in response.json:
raise aiohttp.web.HTTPConflict(text="The server {} is not a GNS3 server".format(self._id)) raise aiohttp.web.HTTPConflict(text="The server {} is not a GNS3 server".format(self._id))
if parse_version(__version__)[:2] != parse_version(response.json["version"])[:2]: if parse_version(__version__)[:2] != parse_version(response.json["version"])[:2]:
@ -197,6 +198,8 @@ class Compute:
raise aiohttp.web.HTTPNotFound(text="{} not found on compute".format(url)) raise aiohttp.web.HTTPNotFound(text="{} not found on compute".format(url))
elif response.status == 409: elif response.status == 409:
raise aiohttp.web.HTTPConflict(text="Conflict {} {}".format(url, body)) raise aiohttp.web.HTTPConflict(text="Conflict {} {}".format(url, body))
elif response.status == 503:
raise aiohttp.web.HTTPServiceUnavailable(text="Service unavailable {} {}".format(url, body))
else: else:
raise NotImplementedError("{} status code is not supported".format(response.status)) raise NotImplementedError("{} status code is not supported".format(response.status))
if body and len(body): if body and len(body):