openstack
/
neutron
Code Issues Proposed changes

Merge "HACKING: fix edge case with log hints"

This commit is contained in:
Jenkins 2015-12-07 18:24:18 +00:00 committed by Gerrit Code Review
parent 14f57a2e00 0ce4510b35
commit 134299bedd
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/hacking/checks.py
View File

@ -30,6 +30,9 @@ import six
# neutron/tests/unit/hacking/test_checks.py
_all_log_levels = {
'reserved': '_', # this should never be used with a log unless
# it is a variable used for a log message and
# a exception
'error': '_LE',
'info': '_LI',
'warn': '_LW',

3
neutron/pecan_wsgi/hooks/translation.py
View File

@ -19,6 +19,7 @@ import webob.exc
from neutron._i18n import _
from neutron.api.v2 import base as v2base
from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
@ -34,6 +35,6 @@ class ExceptionTranslationHook(hooks.PecanHook):
raise to_class(getattr(e, 'msg', e.message))
# leaked unexpected exception, convert to boring old 500 error and
# hide message from user in case it contained sensitive details
LOG.exception(_("An unexpected exception was caught: %s") % e)
LOG.exception(_LE("An unexpected exception was caught: %s"), e)
raise webob.exc.HTTPInternalServerError(
_("An unexpected internal error occurred."))

3
neutron/tests/unit/hacking/test_checks.py
View File

@ -39,6 +39,9 @@ class HackingTestCase(base.BaseTestCase):
self.assertEqual(
0, len(list(checks.validate_log_translations(debug, debug, 'f'))))
for log in logs:
bad = 'LOG.%s(_("Bad"))' % log
self.assertEqual(
1, len(list(checks.validate_log_translations(bad, bad, 'f'))))
bad = 'LOG.%s("Bad")' % log
self.assertEqual(
1, len(list(checks.validate_log_translations(bad, bad, 'f'))))