openstack/vitrage
Code Issues Proposed changes

fix log exception parameters

Browse Source 
Change-Id: I7575d66a16e7cba2758370f66d07557147ad1a62
This commit is contained in:
Eyal 2017-12-11 11:21:16 +02:00
parent 526aae0a9c
commit eddcfe8bc9
7 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vitrage/api/controllers/v1/alarm.py
View File

@ -16,6 +16,7 @@ import json
import pecan import pecan
from oslo_log import log from oslo_log import log
from oslo_utils import encodeutils
from oslo_utils.strutils import bool_from_string from oslo_utils.strutils import bool_from_string
from osprofiler import profiler from osprofiler import profiler
from pecan.core import abort from pecan.core import abort
@ -52,8 +53,9 @@ class AlarmsController(RootRestController):
try: try:
return self._get_alarms(vitrage_id, all_tenants) return self._get_alarms(vitrage_id, all_tenants)
except Exception as e: except Exception as e:
LOG.exception('failed to get alarms %s', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to get alarms %s', to_unicode)
abort(404, to_unicode)
@staticmethod @staticmethod
def _get_alarms(vitrage_id=None, all_tenants=False): def _get_alarms(vitrage_id=None, all_tenants=False):
@ -68,5 +70,6 @@ class AlarmsController(RootRestController):
return alarms_list return alarms_list
except Exception as e: except Exception as e:
LOG.exception('failed to open file %s ', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to open file %s ', to_unicode)
abort(404, to_unicode)

6
vitrage/api/controllers/v1/count.py
View File

@ -14,6 +14,7 @@ import json
import pecan import pecan
from oslo_log import log from oslo_log import log
from oslo_utils import encodeutils
from oslo_utils.strutils import bool_from_string from oslo_utils.strutils import bool_from_string
from pecan.core import abort from pecan.core import abort
@ -50,5 +51,6 @@ class CountsController(RootRestController):
return json.loads(alarm_counts_json) return json.loads(alarm_counts_json)
except Exception as e: except Exception as e:
LOG.exception('failed to get alarm counts %s', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to get alarm counts %s', to_unicode)
abort(404, to_unicode)

6
vitrage/api/controllers/v1/event.py
View File

@ -52,6 +52,6 @@ class EventController(RootRestController):
event_type=event_type, event_type=event_type,
details=details) details=details)
except Exception as e: except Exception as e:
LOG.exception('Failed to post an event %s', to_unicode = encodeutils.exception_to_unicode(e)
encodeutils.exception_to_unicode(e)) LOG.exception('Failed to post an event %s', to_unicode)
abort(404, str(e)) abort(404, to_unicode)

6
vitrage/api/controllers/v1/rca.py
View File

@ -17,6 +17,7 @@ import json
import pecan import pecan
from oslo_log import log from oslo_log import log
from oslo_utils import encodeutils
from oslo_utils.strutils import bool_from_string from oslo_utils.strutils import bool_from_string
from osprofiler import profiler from osprofiler import profiler
from pecan.core import abort from pecan.core import abort
@ -59,5 +60,6 @@ class RCAController(RootRestController):
return graph return graph
except Exception as e: except Exception as e:
LOG.exception('failed to get rca %s ', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to get rca %s ', to_unicode)
abort(404, to_unicode)

17
vitrage/api/controllers/v1/resource.py
View File

@ -13,6 +13,7 @@ import json
import pecan import pecan
from oslo_log import log from oslo_log import log
from oslo_utils import encodeutils
from oslo_utils.strutils import bool_from_string from oslo_utils.strutils import bool_from_string
from osprofiler import profiler from osprofiler import profiler
from pecan.core import abort from pecan.core import abort
@ -46,8 +47,9 @@ class ResourcesController(RootRestController):
try: try:
return self._get_resources(resource_type, all_tenants) return self._get_resources(resource_type, all_tenants)
except Exception as e: except Exception as e:
LOG.exception('failed to list resources %s', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to list resources %s', to_unicode)
abort(404, to_unicode)
@staticmethod @staticmethod
def _get_resources(resource_type=None, all_tenants=False): def _get_resources(resource_type=None, all_tenants=False):
@ -63,8 +65,9 @@ class ResourcesController(RootRestController):
resources = json.loads(resources_json)['resources'] resources = json.loads(resources_json)['resources']
return resources return resources
except Exception as e: except Exception as e:
LOG.exception('failed to get resources %s ', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to get resources %s ', to_unicode)
abort(404, to_unicode)
@pecan.expose('json') @pecan.expose('json')
def get(self, vitrage_id): def get(self, vitrage_id):
@ -92,7 +95,7 @@ class ResourcesController(RootRestController):
return json.loads(resource) return json.loads(resource)
except Exception as e: except Exception as e:
to_unicode = encodeutils.exception_to_unicode(e)
LOG.exception('failed to show resource with vitrage_id(%s),' LOG.exception('failed to show resource with vitrage_id(%s),'
'Exception: %s', 'Exception: %s', vitrage_id, to_unicode)
vitrage_id, e) abort(404, to_unicode)
abort(404, str(e))

33
vitrage/api/controllers/v1/template.py
View File

@ -15,6 +15,7 @@ import json
import pecan import pecan
from oslo_log import log from oslo_log import log
from oslo_utils import encodeutils
from osprofiler import profiler from osprofiler import profiler
from pecan.core import abort from pecan.core import abort
@ -41,8 +42,9 @@ class TemplateController(RootRestController):
try: try:
return self._get_templates() return self._get_templates()
except Exception as e: except Exception as e:
LOG.exception('failed to get template list %s', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to get template list %s', to_unicode)
abort(404, to_unicode)
@pecan.expose('json') @pecan.expose('json')
def get(self, template_uuid): def get(self, template_uuid):
@ -57,8 +59,11 @@ class TemplateController(RootRestController):
try: try:
return self._show_template(template_uuid) return self._show_template(template_uuid)
except Exception as e: except Exception as e:
LOG.exception('failed to show template %s' % template_uuid, e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to show template %s --> %s',
template_uuid,
to_unicode)
abort(404, to_unicode)
@pecan.expose('json') @pecan.expose('json')
def post(self, **kwargs): def post(self, **kwargs):
@ -75,8 +80,9 @@ class TemplateController(RootRestController):
try: try:
return self._validate(templates) return self._validate(templates)
except Exception as e: except Exception as e:
LOG.exception('failed to validate template(s) %s', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to validate template(s) %s', to_unicode)
abort(404, to_unicode)
@staticmethod @staticmethod
def _get_templates(): def _get_templates():
@ -88,8 +94,9 @@ class TemplateController(RootRestController):
template_list = json.loads(templates_json)['templates_details'] template_list = json.loads(templates_json)['templates_details']
return template_list return template_list
except Exception as e: except Exception as e:
LOG.exception('failed to get template list %s ', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to get template list %s ', to_unicode)
abort(404, to_unicode)
@staticmethod @staticmethod
def _show_template(template_uuid): def _show_template(template_uuid):
@ -102,8 +109,9 @@ class TemplateController(RootRestController):
try: try:
return json.loads(template_json) return json.loads(template_json)
except Exception as e: except Exception as e:
LOG.exception('failed to show template with uuid: %s ', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to show template with uuid: %s ', to_unicode)
abort(404, to_unicode)
@staticmethod @staticmethod
def _validate(templates): def _validate(templates):
@ -114,5 +122,6 @@ class TemplateController(RootRestController):
try: try:
return json.loads(result_json) return json.loads(result_json)
except Exception as e: except Exception as e:
LOG.exception('failed to open template file(s) %s ', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to open template file(s) %s ', to_unicode)
abort(404, to_unicode)

6
vitrage/api/controllers/v1/topology.py
View File

@ -16,6 +16,7 @@
import json import json
from oslo_log import log from oslo_log import log
from oslo_utils import encodeutils
from oslo_utils.strutils import bool_from_string from oslo_utils.strutils import bool_from_string
from osprofiler import profiler from osprofiler import profiler
import pecan import pecan
@ -89,8 +90,9 @@ class TopologyController(RootRestController):
return RootRestController.as_tree(graph, node_id) return RootRestController.as_tree(graph, node_id)
except Exception as e: except Exception as e:
LOG.exception('failed to get topology %s ', e) to_unicode = encodeutils.exception_to_unicode(e)
abort(404, str(e)) LOG.exception('failed to get topology %s ', to_unicode)
abort(404, to_unicode)
@staticmethod @staticmethod
def _check_input_para(graph_type, depth, query, root, all_tenants): def _check_input_para(graph_type, depth, query, root, all_tenants):