From 5551d09e3ebac73aa5bd4d094f5ff23a5acbb488 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 7 Feb 2014 01:06:22 +0100 Subject: [PATCH] log: Switch to debug format if loglevels has any debug levels --- mopidy/utils/log.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mopidy/utils/log.py b/mopidy/utils/log.py index d106af8d..cde07693 100644 --- a/mopidy/utils/log.py +++ b/mopidy/utils/log.py @@ -78,10 +78,13 @@ def setup_console_logging(config, verbosity_level): if verbosity_level > max(LOG_LEVELS.keys()): verbosity_level = max(LOG_LEVELS.keys()) - verbosity_filter = VerbosityFilter( - verbosity_level, config.get('loglevels', {})) + loglevels = config.get('loglevels', {}) + has_debug_loglevels = any([ + level < logging.INFO for level in loglevels.values()]) - if verbosity_level < 1: + verbosity_filter = VerbosityFilter(verbosity_level, loglevels) + + if verbosity_level < 1 and not has_debug_loglevels: log_format = config['logging']['console_format'] else: log_format = config['logging']['debug_format']