fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core.logging: ignore CollapseLogsHandler if we're not attached to a terminal

Browse source 
otherwise fails at os.get_terminal_size
This commit is contained in:
karlicoss 2023-10-25 02:27:06 +01:00
parent 1f61e853c9
commit a0910e798d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
my/core/logging.py
View file

@ -3,12 +3,12 @@ from __future__ import annotations
from functools import lru_cache from functools import lru_cache
import logging import logging
import os import os
import sys
from typing import Union from typing import Union
import warnings import warnings
def test() -> None: def test() -> None:
import sys
from typing import Callable from typing import Callable
M: Callable[[str], None] = lambda s: print(s, file=sys.stderr) M: Callable[[str], None] = lambda s: print(s, file=sys.stderr)
@ -128,13 +128,15 @@ def _setup_handlers_and_formatters(name: str) -> None:
logger.addFilter(AddExceptionTraceback()) logger.addFilter(AddExceptionTraceback())
ch = logging.StreamHandler()
collapse_level = get_collapse_level() collapse_level = get_collapse_level()
ch = logging.StreamHandler() if collapse_level is None else CollapseLogsHandler(maxlevel=collapse_level) if collapse_level is None or not sys.stderr.isatty():
handler = logging.StreamHandler()
else:
handler = CollapseLogsHandler(maxlevel=collapse_level)
# default level for handler is NOTSET, which will make it process all messages # default level for handler is NOTSET, which will make it process all messages
# we rely on the logger to actually accept/reject log msgs # we rely on the logger to actually accept/reject log msgs
logger.addHandler(ch) logger.addHandler(handler)
# this attribute is set to True by default, which causes log entries to be passed to root logger (e.g. if you call basicConfig beforehand) # this attribute is set to True by default, which causes log entries to be passed to root logger (e.g. if you call basicConfig beforehand)
# even if log entry is handled by this logger ... not sure what's the point of this behaviour?? # even if log entry is handled by this logger ... not sure what's the point of this behaviour??
@ -151,12 +153,12 @@ def _setup_handlers_and_formatters(name: str) -> None:
FORMAT_COLOR = FORMAT.format(start='%(log_color)s', end='%(reset)s') FORMAT_COLOR = FORMAT.format(start='%(log_color)s', end='%(reset)s')
# colorlog should detect tty in principle, but doesn't handle everything for some reason # colorlog should detect tty in principle, but doesn't handle everything for some reason
# see https://github.com/borntyping/python-colorlog/issues/71 # see https://github.com/borntyping/python-colorlog/issues/71
if ch.stream.isatty(): if handler.stream.isatty():
formatter = colorlog.ColoredFormatter(FORMAT_COLOR) formatter = colorlog.ColoredFormatter(FORMAT_COLOR)
else: else:
formatter = logging.Formatter(FORMAT_NOCOLOR) formatter = logging.Formatter(FORMAT_NOCOLOR)
ch.setFormatter(formatter) handler.setFormatter(formatter)
# by default, logging.exception isn't logging traceback unless called inside of the exception handler # by default, logging.exception isn't logging traceback unless called inside of the exception handler