1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logging: merged duplicated code in fileConfig and dictConfig paths.

Browse Source
This commit is contained in:
Vinay Sajip 2010-08-30 19:02:14 +00:00
parent 609364a989
commit ec1cd1c475
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Lib/logging/config.py
View File

@ -172,8 +172,28 @@ def _install_handlers(cp, formatters):
h.setTarget(handlers[t]) h.setTarget(handlers[t])
return handlers return handlers
def _handle_existing_loggers(existing, child_loggers, disable_existing):
"""
When (re)configuring logging, handle loggers which were in the previous
configuration but are not in the new configuration. There's no point
deleting them as other threads may continue to hold references to them;
and by disabling them, you stop them doing any logging.
def _install_loggers(cp, handlers, disable_existing_loggers): However, don't disable children of named loggers, as that's probably not
what was intended by the user. Also, allow existing loggers to NOT be
disabled if disable_existing is false.
"""
root = logging.root
for log in existing:
logger = root.manager.loggerDict[log]
if log in child_loggers:
logger.level = logging.NOTSET
logger.handlers = []
logger.propagate = True
elif disable_existing:
logger.disabled = True
def _install_loggers(cp, handlers, disable_existing):
"""Create and install loggers""" """Create and install loggers"""
# configure the root first # configure the root first
@ -254,15 +274,15 @@ def _install_loggers(cp, handlers, disable_existing_loggers):
#and by disabling them, you stop them doing any logging. #and by disabling them, you stop them doing any logging.
#However, don't disable children of named loggers, as that's #However, don't disable children of named loggers, as that's
#probably not what was intended by the user. #probably not what was intended by the user.
for log in existing: #for log in existing:
logger = root.manager.loggerDict[log] # logger = root.manager.loggerDict[log]
if log in child_loggers: # if log in child_loggers:
logger.level = logging.NOTSET # logger.level = logging.NOTSET
logger.handlers = [] # logger.handlers = []
logger.propagate = 1 # logger.propagate = 1
elif disable_existing_loggers: # elif disable_existing_loggers:
logger.disabled = 1 # logger.disabled = 1
_handle_existing_loggers(existing, child_loggers, disable_existing)
IDENTIFIER = re.compile('^[a-z_][a-z0-9_]*$', re.I) IDENTIFIER = re.compile('^[a-z_][a-z0-9_]*$', re.I)
@ -617,14 +637,16 @@ class DictConfigurator(BaseConfigurator):
#and by disabling them, you stop them doing any logging. #and by disabling them, you stop them doing any logging.
#However, don't disable children of named loggers, as that's #However, don't disable children of named loggers, as that's
#probably not what was intended by the user. #probably not what was intended by the user.
for log in existing: #for log in existing:
logger = root.manager.loggerDict[log] # logger = root.manager.loggerDict[log]
if log in child_loggers: # if log in child_loggers:
logger.level = logging.NOTSET # logger.level = logging.NOTSET
logger.handlers = [] # logger.handlers = []
logger.propagate = True # logger.propagate = True
elif disable_existing: # elif disable_existing:
logger.disabled = True # logger.disabled = True
_handle_existing_loggers(existing, child_loggers,
disable_existing)
# And finally, do the root logger # And finally, do the root logger
root = config.get('root', None) root = config.get('root', None)