mirror of https://github.com/python/cpython
Issue #17521: Corrected non-enabling of logger following two calls to fileConfig().
This commit is contained in:
parent
0e29f22855
commit
bb2dad8915
|
@ -260,8 +260,8 @@ def _install_loggers(cp, handlers, disable_existing_loggers):
|
|||
logger.level = logging.NOTSET
|
||||
logger.handlers = []
|
||||
logger.propagate = 1
|
||||
elif disable_existing_loggers:
|
||||
logger.disabled = 1
|
||||
else:
|
||||
logger.disabled = disable_existing_loggers
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -714,9 +714,30 @@ class ConfigFileTest(BaseTest):
|
|||
datefmt=
|
||||
"""
|
||||
|
||||
def apply_config(self, conf):
|
||||
disable_test = """
|
||||
[loggers]
|
||||
keys=root
|
||||
|
||||
[handlers]
|
||||
keys=screen
|
||||
|
||||
[formatters]
|
||||
keys=
|
||||
|
||||
[logger_root]
|
||||
level=DEBUG
|
||||
handlers=screen
|
||||
|
||||
[handler_screen]
|
||||
level=DEBUG
|
||||
class=StreamHandler
|
||||
args=(sys.stdout,)
|
||||
formatter=
|
||||
"""
|
||||
|
||||
def apply_config(self, conf, **kwargs):
|
||||
file = cStringIO.StringIO(textwrap.dedent(conf))
|
||||
logging.config.fileConfig(file)
|
||||
logging.config.fileConfig(file, **kwargs)
|
||||
|
||||
def test_config0_ok(self):
|
||||
# A simple config file which overrides the default settings.
|
||||
|
@ -820,6 +841,15 @@ class ConfigFileTest(BaseTest):
|
|||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_logger_disabling(self):
|
||||
self.apply_config(self.disable_test)
|
||||
logger = logging.getLogger('foo')
|
||||
self.assertFalse(logger.disabled)
|
||||
self.apply_config(self.disable_test)
|
||||
self.assertTrue(logger.disabled)
|
||||
self.apply_config(self.disable_test, disable_existing_loggers=False)
|
||||
self.assertFalse(logger.disabled)
|
||||
|
||||
class LogRecordStreamHandler(StreamRequestHandler):
|
||||
|
||||
"""Handler for a streaming logging request. It saves the log message in the
|
||||
|
|
Loading…
Reference in New Issue