Merge "Fix needed for keystone middleware logging"

Code Issues Proposed changes

This commit is contained in:

Jenkins

2012年12月15日 18:50:47 +00:00

committed by Gerrit Code Review

parent 2ed1d3ba41 a064fa4227

commit 7f6099707c

1 changed files with 5 additions and 0 deletions

@@ -624,6 +624,11 @@ class SwiftLogFormatter(logging.Formatter):

"""

def format(self, record):

if not hasattr(record, 'server'):

# 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

record.txn_id not in msg):