From 3471b03ef92ef1f7ac84ba9631ccc603c5838c26 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Thu, 12 Feb 2015 21:39:24 +0100 Subject: [PATCH] Clarify JSON schema validation errors --- gns3server/web/response.py | 4 +--- gns3server/web/route.py | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/gns3server/web/response.py b/gns3server/web/response.py index 9ae3c1a6f..9241d0c93 100644 --- a/gns3server/web/response.py +++ b/gns3server/web/response.py @@ -62,8 +62,6 @@ class Response(aiohttp.web.Response): try: jsonschema.validate(answer, self._output_schema) except jsonschema.ValidationError as e: - log.error("Invalid output schema {} '{}' in schema: {}".format(e.validator, - e.validator_value, - json.dumps(e.schema))) + log.error("Invalid output query. JSON schema error: {}".format(e.message)) raise aiohttp.web.HTTPBadRequest(text="{}".format(e)) self.body = json.dumps(answer, indent=4, sort_keys=True).encode('utf-8') diff --git a/gns3server/web/route.py b/gns3server/web/route.py index 10c282057..d63701fc9 100644 --- a/gns3server/web/route.py +++ b/gns3server/web/route.py @@ -28,7 +28,6 @@ log = logging.getLogger(__name__) from ..modules.vm_error import VMError from .response import Response - @asyncio.coroutine def parse_request(request, input_schema): """Parse body of request and raise HTTP errors in case of problems""" @@ -42,9 +41,7 @@ def parse_request(request, input_schema): try: jsonschema.validate(request.json, input_schema) except jsonschema.ValidationError as e: - log.error("Invalid input schema {} '{}' in schema: {}".format(e.validator, - e.validator_value, - json.dumps(e.schema))) + log.error("Invalid input query. JSON schema error: {}".format(e.message)) raise aiohttp.web.HTTPBadRequest(text="Request is not {} '{}' in schema: {}".format( e.validator, e.validator_value,