Fixed log format reconfiguration regression.
Commit c991135 introduced a regression where it was no longer possible
to re-configure the loggers once they had been set up. This is now
fixed.
This commit is contained in:
@@ -50,6 +50,8 @@ HIGHLIGHT = {
|
|||||||
'WARNING': YELLOW,
|
'WARNING': YELLOW,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class InverseLevelFilter(object):
|
class InverseLevelFilter(object):
|
||||||
"""
|
"""
|
||||||
@@ -287,19 +289,9 @@ def configure(loglevel=logging.INFO, verbose=False, simple=False):
|
|||||||
|
|
||||||
logger = logging.getLogger('overviewer_core')
|
logger = logging.getLogger('overviewer_core')
|
||||||
logger.setLevel(loglevel)
|
logger.setLevel(loglevel)
|
||||||
|
|
||||||
if not logger.handlers:
|
|
||||||
# No handlers have been configure yet... (probably the first call of
|
|
||||||
# logger.configure)
|
|
||||||
is_windows = platform.system() == 'Windows'
|
is_windows = platform.system() == 'Windows'
|
||||||
outstream = sys.stdout
|
outstream = sys.stdout
|
||||||
errstream = sys.stderr
|
errstream = sys.stderr
|
||||||
errformatter = DumbFormatter(verbose)
|
|
||||||
outformatter = DumbFormatter(verbose)
|
|
||||||
|
|
||||||
if is_windows:
|
|
||||||
outstream = WindowsOutputStream(outstream)
|
|
||||||
errstream = WindowsOutputStream(errstream)
|
|
||||||
|
|
||||||
if (is_windows or outstream.isatty()) and not simple:
|
if (is_windows or outstream.isatty()) and not simple:
|
||||||
# Our custom output stream processor knows how to deal with select
|
# Our custom output stream processor knows how to deal with select
|
||||||
@@ -307,11 +299,32 @@ def configure(loglevel=logging.INFO, verbose=False, simple=False):
|
|||||||
errformatter = ANSIColorFormatter(verbose)
|
errformatter = ANSIColorFormatter(verbose)
|
||||||
outformatter = ANSIColorFormatter(verbose)
|
outformatter = ANSIColorFormatter(verbose)
|
||||||
|
|
||||||
|
|
||||||
|
if not logger.handlers:
|
||||||
|
# No handlers have been configure yet... (probably the first call of
|
||||||
|
# logger.configure)
|
||||||
|
errformatter = DumbFormatter(verbose)
|
||||||
|
outformatter = DumbFormatter(verbose)
|
||||||
|
|
||||||
|
if is_windows:
|
||||||
|
outstream = WindowsOutputStream(outstream)
|
||||||
|
errstream = WindowsOutputStream(errstream)
|
||||||
|
|
||||||
out_handler = logging.StreamHandler(outstream)
|
out_handler = logging.StreamHandler(outstream)
|
||||||
out_handler.setFormatter(outformatter)
|
|
||||||
out_handler.addFilter(InverseLevelFilter(max_level=logging.WARN))
|
out_handler.addFilter(InverseLevelFilter(max_level=logging.WARN))
|
||||||
|
out_handler.set_name('overviewer_stdout_handler')
|
||||||
err_handler = logging.StreamHandler(errstream)
|
err_handler = logging.StreamHandler(errstream)
|
||||||
|
err_handler.set_name('overviewer_stderr_handler')
|
||||||
err_handler.setLevel(logging.WARN)
|
err_handler.setLevel(logging.WARN)
|
||||||
err_handler.setFormatter(errformatter)
|
|
||||||
logger.addHandler(out_handler)
|
logger.addHandler(out_handler)
|
||||||
logger.addHandler(err_handler)
|
logger.addHandler(err_handler)
|
||||||
|
|
||||||
|
try:
|
||||||
|
out_handler = logging._handlers['overviewer_stdout_handler']
|
||||||
|
err_handler = logging._handlers['overviewer_stderr_handler']
|
||||||
|
out_handler.setFormatter(outformatter)
|
||||||
|
err_handler.setFormatter(errformatter)
|
||||||
|
out_handler.setLevel(loglevel)
|
||||||
|
except KeyError as exc:
|
||||||
|
LOG.warn('Unable to change log handler format '
|
||||||
|
'(KeyError for {0})'.format(exc))
|
||||||
|
|||||||
Reference in New Issue
Block a user