openstack
/
manila
Code Issues Proposed changes

Merge "Fix logging in wsgi module"

This commit is contained in:
Zuul 2019-03-14 21:07:34 +00:00 committed by Gerrit Code Review
parent beffa2595a 7ed71490ef
commit 7f17a7bc27
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manila/api/openstack/wsgi.py
View File

@ -20,6 +20,7 @@ import time
from oslo_log import log from oslo_log import log
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import encodeutils
from oslo_utils import strutils from oslo_utils import strutils
import six import six
from six.moves import http_client from six.moves import http_client
@ -781,15 +782,21 @@ class Resource(wsgi.Application):
msg = _("Malformed request body") msg = _("Malformed request body")
return Fault(webob.exc.HTTPBadRequest(explanation=msg)) return Fault(webob.exc.HTTPBadRequest(explanation=msg))
try:
method_name = meth.__qualname__
except AttributeError:
method_name = 'Controller: %s Method: %s' % (
six.text_type(self.controller), meth.__name__)
if body: if body:
decoded_body = encodeutils.safe_decode(body, errors='ignore')
msg = ("Action: '%(action)s', calling method: %(meth)s, body: " msg = ("Action: '%(action)s', calling method: %(meth)s, body: "
"%(body)s") % {'action': action, "%(body)s") % {'action': action,
'body': six.text_type(body), 'body': decoded_body,
'meth': six.text_type(meth)} 'meth': method_name}
LOG.debug(strutils.mask_password(msg)) LOG.debug(strutils.mask_password(msg))
else: else:
LOG.debug("Calling method '%(meth)s'", LOG.debug("Calling method '%(meth)s'", {'meth': method_name})
{'meth': six.text_type(meth)})
# Now, deserialize the request body... # Now, deserialize the request body...
try: try:
@ -855,7 +862,7 @@ class Resource(wsgi.Application):
try: try:
msg_dict = dict(url=request.url, status=response.status_int) msg_dict = dict(url=request.url, status=response.status_int)
msg = _("%(url)s returned with HTTP %(status)d") % msg_dict msg = _("%(url)s returned with HTTP %(status)s") % msg_dict
except AttributeError as e: except AttributeError as e:
msg_dict = dict(url=request.url, e=e) msg_dict = dict(url=request.url, e=e)
msg = _("%(url)s returned a fault: %(e)s") % msg_dict msg = _("%(url)s returned a fault: %(e)s") % msg_dict