From dbedd6b6513605ca3ec1313387eb871e1c5046af Mon Sep 17 00:00:00 2001 From: Eyal Date: Wed, 13 Dec 2017 10:10:19 +0200 Subject: [PATCH] fix error message when resource not found Depends-On: I428d04598910edfe67e8b8deb608bcf1233d672d Change-Id: I65dc70c3fa2fd7083bbabf6af47907b01fb93ebb --- vitrage/api/controllers/v1/resource.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vitrage/api/controllers/v1/resource.py b/vitrage/api/controllers/v1/resource.py index 0e739108f..a99b2fa0f 100644 --- a/vitrage/api/controllers/v1/resource.py +++ b/vitrage/api/controllers/v1/resource.py @@ -76,11 +76,7 @@ class ResourcesController(RootRestController): pecan.request.enforcer, {}) - try: - return self._show_resource(vitrage_id) - except Exception as e: - LOG.exception('failed to show resource %s, %s' % vitrage_id, e) - abort(404, str(e)) + return self._show_resource(vitrage_id) @staticmethod def _show_resource(vitrage_id): @@ -89,7 +85,11 @@ class ResourcesController(RootRestController): pecan.request.context, 'show_resource', vitrage_id=vitrage_id) - LOG.info(resource) + if not resource: + abort(404, "Failed to find resource %s" % vitrage_id) + + LOG.debug('resource found = %s', resource) + return json.loads(resource) except Exception as e: LOG.exception('failed to show resource with vitrage_id(%s),'