openstack/swift
Code Issues Proposed changes

Merge "Fixes console logging with non-swift middleware"

Browse Source
This commit is contained in:
Jenkins 2012-12-20 21:40:03 +00:00 committed by Gerrit Code Review
commit 032f44859a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swift/common/utils.py
View File

@ -628,12 +628,13 @@ class SwiftLogFormatter(logging.Formatter):
# Catch log messages that were not initiated by swift
# (for example, the keystone auth middleware)
record.server = record.name
return logging.Formatter.format(self, record)
msg = logging.Formatter.format(self, record)
if (record.txn_id and record.levelno != logging.INFO and
if (hasattr(record, 'txn_id') and record.txn_id and
record.levelno != logging.INFO and
record.txn_id not in msg):
msg = "%s (txn: %s)" % (msg, record.txn_id)
if (record.client_ip and record.levelno != logging.INFO and
if (hasattr(record, 'client_ip') and record.client_ip and
record.levelno != logging.INFO and
record.client_ip not in msg):
msg = "%s (client_ip: %s)" % (msg, record.client_ip)
return msg