openstack/swift
Code Issues Proposed changes

Merge "Simple fix for proxy-logging empty field handling"

Browse Source
This commit is contained in:
Jenkins 2013-11-22 21:50:12 +00:00 committed by Gerrit Code Review
commit 2cc46d70bf
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/common/middleware/proxy_logging.py
View File

@ -126,9 +126,7 @@ class ProxyLoggingMiddleware(object):
req.environ['swift.proxy_access_log_made'] = True
def obscure_sensitive(self, value):
if not value:
return '-'
if len(value) > self.reveal_sensitive_prefix:
if value and len(value) > self.reveal_sensitive_prefix:
return value[:self.reveal_sensitive_prefix] + '...'
return value
@ -174,7 +172,7 @@ class ProxyLoggingMiddleware(object):
logged_headers,
'%.4f' % request_time,
req.environ.get('swift.source'),
','.join(req.environ.get('swift.log_info') or '-'),
','.join(req.environ.get('swift.log_info') or ''),
)))
self.mark_req_logged(req)
# Log timing and bytes-transfered data to StatsD