github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use 'util.Formatter' when formatting logging output

Browse Source
This commit is contained in:
Mike Fährmann
2020-03-18 22:41:08 +01:00
parent 8b60bd6a91
commit 11d3247c85
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gallery_dl/output.py
View File

@@ -39,17 +39,27 @@ class Formatter(logging.Formatter):
"""Custom formatter that supports different formats per loglevel""" """Custom formatter that supports different formats per loglevel"""
def __init__(self, fmt, datefmt): def __init__(self, fmt, datefmt):
if not isinstance(fmt, dict): if isinstance(fmt, dict):
for key in ("debug", "info", "warning", "error"):
value = fmt[key] if key in fmt else LOG_FORMAT
fmt[key] = (util.Formatter(value).format_map,
"{asctime" in value)
else:
if fmt == LOG_FORMAT:
fmt = (fmt.format_map, False)
else:
fmt = (util.Formatter(fmt).format_map, "{asctime" in fmt)
fmt = {"debug": fmt, "info": fmt, "warning": fmt, "error": fmt} fmt = {"debug": fmt, "info": fmt, "warning": fmt, "error": fmt}
self.formats = fmt self.formats = fmt
self.datefmt = datefmt self.datefmt = datefmt
def format(self, record): def format(self, record):
record.message = record.getMessage() record.message = record.getMessage()
fmt = self.formats[record.levelname] fmt, asctime = self.formats[record.levelname]
if "{asctime" in fmt: if asctime:
record.asctime = self.formatTime(record, self.datefmt) record.asctime = self.formatTime(record, self.datefmt)
msg = fmt.format_map(record.__dict__) msg = fmt(record.__dict__)
if record.exc_info and not record.exc_text: if record.exc_info and not record.exc_text:
record.exc_text = self.formatException(record.exc_info) record.exc_text = self.formatException(record.exc_info)
if record.exc_text: if record.exc_text: