Commit cb5b335a authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub

Merge pull request #14618 from akx/log-fmt-fix

Logging: set formatter correctly for fallback logger too
parents 85bf2eb4 0011640a
...@@ -36,20 +36,21 @@ def setup_logging(loglevel): ...@@ -36,20 +36,21 @@ def setup_logging(loglevel):
# Already configured, do not interfere # Already configured, do not interfere
return return
formatter = logging.Formatter(
'%(asctime)s %(levelname)s [%(name)s] %(message)s',
'%Y-%m-%d %H:%M:%S',
)
if os.environ.get("SD_WEBUI_RICH_LOG"): if os.environ.get("SD_WEBUI_RICH_LOG"):
from rich.logging import RichHandler from rich.logging import RichHandler
handler = RichHandler() handler = RichHandler()
else: else:
handler = logging.StreamHandler() handler = logging.StreamHandler()
handler.setFormatter(formatter)
if TqdmLoggingHandler: if TqdmLoggingHandler:
handler = TqdmLoggingHandler(handler) handler = TqdmLoggingHandler(handler)
formatter = logging.Formatter(
'%(asctime)s %(levelname)s [%(name)s] %(message)s',
'%Y-%m-%d %H:%M:%S',
)
handler.setFormatter(formatter) handler.setFormatter(formatter)
log_level = getattr(logging, loglevel.upper(), None) or logging.INFO log_level = getattr(logging, loglevel.upper(), None) or logging.INFO
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment