arthurcai/Joint-Teapot
2
0
Fork 0
forked from JOJ/Joint-Teapot
Code Pull Requests Activity

revert: "feat: InterceptHandler with no depth on no backtrace"

Browse Source 
This reverts commit fdfebc87d8.
This commit is contained in:
张泊明518370910136 2024-10-02 23:49:51 -04:00
parent fdfebc87d8
commit 6c047795ea
Signed by untrusted user: 张泊明518370910136
GPG Key ID: CA088E6D9284F870
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
joint_teapot/utils/logger.py
View File

@ -11,8 +11,9 @@ from joint_teapot.config import settings
# recipe from https://loguru.readthedocs.io/en/stable/overview.html#entirely-compatible-with-standard-logging # recipe from https://loguru.readthedocs.io/en/stable/overview.html#entirely-compatible-with-standard-logging
class InterceptHandler(logging.Handler): class InterceptHandler(logging.Handler):
def __init__(self, backtrace: bool = True): def __init__(self, diagnose: bool = True, backtrace: bool = True):
super().__init__() super().__init__()
self.diagnose = diagnose
self.backtrace = backtrace self.backtrace = backtrace
def emit(self, record: logging.LogRecord) -> None: def emit(self, record: logging.LogRecord) -> None:
@ -21,16 +22,16 @@ class InterceptHandler(logging.Handler):
except ValueError: except ValueError:
level = record.levelno level = record.levelno
logger_opt = logger.opt(depth=0) # Find caller from where originated the logged message
if self.backtrace: frame: Optional[FrameType] = sys._getframe(6)
# Find caller from where originated the logged message depth = 6
frame: Optional[FrameType] = sys._getframe(6) while frame and frame.f_code.co_filename == logging.__file__:
depth = 6 frame = frame.f_back
while frame and frame.f_code.co_filename == logging.__file__: depth += 1
frame = frame.f_back
depth += 1 logger.opt(depth=depth, exception=record.exc_info).log(
logger_opt = logger.opt(depth=depth, exception=record.exc_info) level, record.getMessage(), diagnose=self.diagnose, backtrace=self.backtrace
logger_opt.log(level, record.getMessage()) )
def set_logger( def set_logger(
@ -39,7 +40,9 @@ def set_logger(
diagnose: bool = True, diagnose: bool = True,
backtrace: bool = True, backtrace: bool = True,
) -> None: ) -> None:
logging.basicConfig(handlers=[InterceptHandler(backtrace)], level=0, force=True) logging.basicConfig(
handlers=[InterceptHandler(diagnose, backtrace)], level=0, force=True
)
logger.remove() logger.remove()
logger.add( logger.add(
stderr, stderr,