arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-05-29 12:18:56 +00:00
Code Issues Releases Wiki Activity

Cleanly forward exception from compute to controller

Browse Source
This commit is contained in:
Julien Duponchelle 2016-06-07 16:06:37 +02:00
parent d8bdd16e13
commit 972cbd0594
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gns3server/controller/compute.py
View File

@ -305,16 +305,24 @@ class Compute:
body = body.decode() body = body.decode()
if response.status >= 300: if response.status >= 300:
# Try to decode the GNS3 error
try:
msg = json.loads(body)["message"]
except (KeyError, json.decoder.JSONDecodeError):
msg = body
if response.status == 400: if response.status == 400:
raise aiohttp.web.HTTPBadRequest(text="Bad request {} {}".format(url, body)) raise aiohttp.web.HTTPBadRequest(text="Bad request {} {}".format(url, body))
elif response.status == 401: elif response.status == 401:
raise aiohttp.web.HTTPUnauthorized(text="Invalid authentication for compute {}".format(self.id)) raise aiohttp.web.HTTPUnauthorized(text="Invalid authentication for compute {}".format(self.id))
elif response.status == 403: elif response.status == 403:
raise aiohttp.web.HTTPForbidden(text="Forbidden {} {}".format(url, body)) raise aiohttp.web.HTTPForbidden(text=msg)
elif response.status == 404: elif response.status == 404:
raise aiohttp.web.HTTPNotFound(text="{} not found on compute".format(url)) raise aiohttp.web.HTTPNotFound(text=msg)
elif response.status == 409: elif response.status == 409:
raise aiohttp.web.HTTPConflict(text="Conflict {} {}".format(url, body)) raise aiohttp.web.HTTPConflict(text=msg)
elif response.status == 500:
raise aiohttp.web.HTTPInternalServerError(text="Internal server error {}".format(url))
elif response.status == 503: elif response.status == 503:
raise aiohttp.web.HTTPServiceUnavailable(text="Service unavailable {} {}".format(url, body)) raise aiohttp.web.HTTPServiceUnavailable(text="Service unavailable {} {}".format(url, body))
else: else:

6
gns3server/web/route.py
View File

@ -25,7 +25,7 @@ import traceback
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
from ..compute.error import NodeError from ..compute.error import NodeError, ImageMissingError
from ..controller.controller_error import ControllerError from ..controller.controller_error import ControllerError
from ..ubridge.ubridge_error import UbridgeError from ..ubridge.ubridge_error import UbridgeError
from .response import Response from .response import Response
@ -198,10 +198,10 @@ class Route(object):
response.set_status(409) response.set_status(409)
response.json({"message": str(e), "status": 409}) response.json({"message": str(e), "status": 409})
except (NodeError, UbridgeError, ImageMissingError) as e: except (NodeError, UbridgeError, ImageMissingError) as e:
log.error("Node error detected: {type}".format(type=type(e)), exc_info=1) log.error("Node error detected: {type}".format(type=e.__class__.__name__), exc_info=1)
response = Response(request=request, route=route) response = Response(request=request, route=route)
response.set_status(409) response.set_status(409)
response.json({"message": str(e), "status": 409, "exception": str(e.__class__)}) response.json({"message": str(e), "status": 409, "exception": e.__class__.__name__})
except asyncio.futures.CancelledError as e: except asyncio.futures.CancelledError as e:
log.error("Request canceled") log.error("Request canceled")
response = Response(request=request, route=route) response = Response(request=request, route=route)