mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added threadName and now using re-entrant lock

Browse source
This commit is contained in:
Vinay Sajip 2005-03-31 20:16:55 +00:00
parent a6e8a4ad12
commit 4a70486c37
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/logging/__init__.py
View file

@ -42,7 +42,7 @@ except ImportError:
__author__ = "Vinay Sajip <vinay_sajip@red-dove.com>" __author__ = "Vinay Sajip <vinay_sajip@red-dove.com>"
__status__ = "beta" __status__ = "beta"
__version__ = "0.4.9.6" __version__ = "0.4.9.6"
__date__ = "12 March 2005" __date__ = "27 March 2005"
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Miscellaneous module data # Miscellaneous module data
@ -241,8 +241,10 @@ class LogRecord:
self.relativeCreated = (self.created - _startTime) * 1000 self.relativeCreated = (self.created - _startTime) * 1000
if thread: if thread:
self.thread = thread.get_ident() self.thread = thread.get_ident()
self.threadName = threading.currentThread().getName()
else: else:
self.thread = None self.thread = None
self.threadName = None
if hasattr(os, 'getpid'): if hasattr(os, 'getpid'):
self.process = os.getpid() self.process = os.getpid()
else: else:
@ -320,6 +322,7 @@ class Formatter:
relative to the time the logging module was loaded relative to the time the logging module was loaded
(typically at application startup time) (typically at application startup time)
%(thread)d Thread ID (if available) %(thread)d Thread ID (if available)
%(threadName)s Thread name (if available)
%(process)d Process ID (if available) %(process)d Process ID (if available)
%(message)s The result of record.getMessage(), computed just as %(message)s The result of record.getMessage(), computed just as
the record is emitted the record is emitted
@ -570,7 +573,7 @@ class Handler(Filterer):
Acquire a thread lock for serializing access to the underlying I/O. Acquire a thread lock for serializing access to the underlying I/O.
""" """
if thread: if thread:
self.lock = thread.allocate_lock() self.lock = threading.RLock()
else: else:
self.lock = None self.lock = None