openstack/swift
Code Issues Proposed changes

Fixes console logging with non-swift middleware

Browse Source 
Fixes logging if logging to the console with non-swift middleware (such
as keystone) enabled.  This also fixes issues with swift in devstack

Change-Id: Ib8b691b62b657a6d4ecdb1648d1fc2f3a0479982
This commit is contained in:
Chuck Thier
2012-12-19 17:54:06 -06:00
parent 74038dccbb
commit 53ed90beef
1 changed files with 4 additions and 3 deletions
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 # Catch log messages that were not initiated by swift
# (for example, the keystone auth middleware) # (for example, the keystone auth middleware)
record.server = record.name record.server = record.name
return logging.Formatter.format(self, record)
msg = 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): record.txn_id not in msg):
msg = "%s (txn: %s)" % (msg, record.txn_id) 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): record.client_ip not in msg):
msg = "%s (client_ip: %s)" % (msg, record.client_ip) msg = "%s (client_ip: %s)" % (msg, record.client_ip)
return msg return msg