Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Added function name to LogRecord.

This commit is contained in:
Vinay Sajip 2006-02-09 08:48:36 +00:00
parent 260ce43252
commit ed1992f2aa
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/logging/__init__.py
View File

@ -203,7 +203,8 @@ class LogRecord:
the source line where the logging call was made, and any exception the source line where the logging call was made, and any exception
information to be logged. information to be logged.
""" """
def __init__(self, name, level, pathname, lineno, msg, args, exc_info): def __init__(self, name, level, pathname, lineno,
msg, args, exc_info, func):
""" """
Initialize a logging record with interesting information. Initialize a logging record with interesting information.
""" """
@ -238,6 +239,7 @@ class LogRecord:
self.exc_info = exc_info self.exc_info = exc_info
self.exc_text = None # used to cache the traceback text self.exc_text = None # used to cache the traceback text
self.lineno = lineno self.lineno = lineno
self.funcName = func
self.created = ct self.created = ct
self.msecs = (ct - long(ct)) * 1000 self.msecs = (ct - long(ct)) * 1000
self.relativeCreated = (self.created - _startTime) * 1000 self.relativeCreated = (self.created - _startTime) * 1000
@ -283,7 +285,7 @@ def makeLogRecord(dict):
a socket connection (which is sent as a dictionary) into a LogRecord a socket connection (which is sent as a dictionary) into a LogRecord
instance. instance.
""" """
rv = LogRecord(None, None, "", 0, "", (), None) rv = LogRecord(None, None, "", 0, "", (), None, None)
rv.__dict__.update(dict) rv.__dict__.update(dict)
return rv return rv
@ -318,6 +320,7 @@ class Formatter:
%(module)s Module (name portion of filename) %(module)s Module (name portion of filename)
%(lineno)d Source line number where the logging call was issued %(lineno)d Source line number where the logging call was issued
(if available) (if available)
%(funcName)s Function name
%(created)f Time when the LogRecord was created (time.time() %(created)f Time when the LogRecord was created (time.time()
return value) return value)
%(asctime)s Textual time when the LogRecord was created %(asctime)s Textual time when the LogRecord was created
@ -1053,12 +1056,12 @@ class Logger(Filterer):
continue continue
return filename, f.f_lineno, co.co_name return filename, f.f_lineno, co.co_name
def makeRecord(self, name, level, fn, lno, msg, args, exc_info, extra=None): def makeRecord(self, name, level, fn, lno, msg, args, exc_info, func=None, extra=None):
""" """
A factory method which can be overridden in subclasses to create A factory method which can be overridden in subclasses to create
specialized LogRecords. specialized LogRecords.
""" """
rv = LogRecord(name, level, fn, lno, msg, args, exc_info) rv = LogRecord(name, level, fn, lno, msg, args, exc_info, func)
if extra: if extra:
for key in extra: for key in extra:
if (key in ["message", "asctime"]) or (key in rv.__dict__): if (key in ["message", "asctime"]) or (key in rv.__dict__):
@ -1078,7 +1081,7 @@ class Logger(Filterer):
if exc_info: if exc_info:
if type(exc_info) != types.TupleType: if type(exc_info) != types.TupleType:
exc_info = sys.exc_info() exc_info = sys.exc_info()
record = self.makeRecord(self.name, level, fn, lno, msg, args, exc_info, extra) record = self.makeRecord(self.name, level, fn, lno, msg, args, exc_info, func, extra)
self.handle(record) self.handle(record)
def handle(self, record): def handle(self, record):