openstack
/
nova
Code Issues Proposed changes

Merge "Avoid Forcing the Translation of Translatable Variables"

This commit is contained in:
Jenkins 2016-10-19 03:43:41 +00:00 committed by Gerrit Code Review
parent 7067ca71fb b2c9666a75
commit 0caf296d3d
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/api/openstack/__init__.py
View File

@ -20,7 +20,6 @@ WSGI middleware for OpenStack API controllers.
from oslo_log import log as logging
import routes
import six
import stevedore
import webob.dec
import webob.exc
@ -54,7 +53,7 @@ class FaultWrapper(base_wsgi.Middleware):
status, webob.exc.HTTPInternalServerError)()
def _error(self, inner, req):
LOG.exception(_LE("Caught error: %s"), six.text_type(inner))
LOG.exception(_LE("Caught error: %s"), inner)
safe = getattr(inner, 'safe', False)
headers = getattr(inner, 'headers', None)

3
nova/cmd/api.py
View File

@ -24,7 +24,6 @@ import sys
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
import six
import nova.conf
from nova import config
@ -63,7 +62,7 @@ def main():
except exception.PasteAppNotFound as ex:
log.warning(
_LW("%s. ``enabled_apis`` includes bad values. "
"Fix to remove this warning."), six.text_type(ex))
"Fix to remove this warning."), ex)
if started == 0:
log.error(_LE('No APIs were started. '

2
nova/network/security_group/neutron_driver.py
View File

@ -243,7 +243,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
"group %s"), name)
self.raise_over_quota(six.text_type(e))
elif e.status_code == 400:
LOG.exception(_LE("Neutron Error: %s"), six.text_type(e))
LOG.exception(_LE("Neutron Error: %s"), e)
self.raise_invalid_property(six.text_type(e))
else:
LOG.exception(_LE("Neutron Error:"))