andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release/0.18.2' into develop

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-02-07 01:06:37 +01:00
commit 32c30551fb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/utils/log.py
View File

@ -78,10 +78,13 @@ def setup_console_logging(config, verbosity_level):
if verbosity_level > max(LOG_LEVELS.keys()): if verbosity_level > max(LOG_LEVELS.keys()):
verbosity_level = max(LOG_LEVELS.keys()) verbosity_level = max(LOG_LEVELS.keys())
verbosity_filter = VerbosityFilter( loglevels = config.get('loglevels', {})
verbosity_level, 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'] log_format = config['logging']['console_format']
else: else:
log_format = config['logging']['debug_format'] log_format = config['logging']['debug_format']