clan_cli: Add exception handling in logger
This commit is contained in:
parent
51b087f7ae
commit
6c17fa648f
@ -17,9 +17,12 @@ def get_formatter(color: str) -> Callable[[logging.LogRecord, bool], logging.For
|
|||||||
record: logging.LogRecord, with_location: bool
|
record: logging.LogRecord, with_location: bool
|
||||||
) -> logging.Formatter:
|
) -> logging.Formatter:
|
||||||
reset = "\x1b[0m"
|
reset = "\x1b[0m"
|
||||||
filepath = Path(record.pathname).resolve()
|
|
||||||
home = Path.home()
|
try:
|
||||||
filepath = Path("~", filepath.relative_to(home))
|
filepath = Path(record.pathname).resolve()
|
||||||
|
filepath = Path("~", filepath.relative_to(Path.home()))
|
||||||
|
except Exception:
|
||||||
|
filepath = Path(record.pathname)
|
||||||
|
|
||||||
if not with_location:
|
if not with_location:
|
||||||
return logging.Formatter(f"{color}%(levelname)s{reset}: %(message)s")
|
return logging.Formatter(f"{color}%(levelname)s{reset}: %(message)s")
|
||||||
@ -65,8 +68,12 @@ def get_caller() -> str:
|
|||||||
if caller_frame is None:
|
if caller_frame is None:
|
||||||
return "unknown"
|
return "unknown"
|
||||||
frame_info = inspect.getframeinfo(caller_frame)
|
frame_info = inspect.getframeinfo(caller_frame)
|
||||||
filepath = Path(frame_info.filename).resolve()
|
|
||||||
filepath = Path("~", filepath.relative_to(Path.home()))
|
try:
|
||||||
|
filepath = Path(frame_info.filename).resolve()
|
||||||
|
filepath = Path("~", filepath.relative_to(Path.home()))
|
||||||
|
except Exception:
|
||||||
|
filepath = Path(frame_info.filename)
|
||||||
|
|
||||||
ret = f"{filepath}:{frame_info.lineno}::{frame_info.function}"
|
ret = f"{filepath}:{frame_info.lineno}::{frame_info.function}"
|
||||||
return ret
|
return ret
|
||||||
|
Loading…
Reference in New Issue
Block a user