@@ -0,0 +1,3 @@
|
||||
__all__ = ['LoggerConfig', 'init']
|
||||
|
||||
from .logger import LoggerConfig, init
|
||||
@@ -0,0 +1,84 @@
|
||||
import logging
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
class ColoredConsoleFormatter(logging.Formatter):
|
||||
TIME_COLOR = '\033[38;2;89;89;89m'
|
||||
RESET = '\033[0m'
|
||||
BOLD = '\033[1m'
|
||||
DARK_CYAN = '\033[36m'
|
||||
DARK_YELLOW = '\033[33m'
|
||||
RED = '\033[91m'
|
||||
|
||||
LEVEL_COLORS = {
|
||||
logging.DEBUG: '\033[36m',
|
||||
logging.INFO: '\033[32m',
|
||||
logging.WARNING: '\033[33m',
|
||||
logging.ERROR: RED,
|
||||
logging.CRITICAL: '\033[35m',
|
||||
}
|
||||
|
||||
LEVEL_NAMES = {
|
||||
logging.DEBUG: 'DBG',
|
||||
logging.INFO: 'INF',
|
||||
logging.WARNING: 'WRN',
|
||||
logging.ERROR: 'ERR',
|
||||
logging.CRITICAL: 'CRT',
|
||||
}
|
||||
|
||||
def format(self, record: logging.LogRecord) -> str:
|
||||
timestamp = f'{self.TIME_COLOR}{datetime.fromtimestamp(record.created).strftime("%H:%M:%S")}{self.RESET}'
|
||||
|
||||
level_name = self.LEVEL_NAMES.get(record.levelno, record.levelname[:3])
|
||||
level_color = self.LEVEL_COLORS.get(record.levelno, '')
|
||||
level = f'{level_color}{level_name}{self.RESET}'
|
||||
|
||||
message_color = self.RED if record.levelno >= logging.ERROR else ''
|
||||
message = f'{message_color}{self.BOLD}{record.getMessage()}{self.RESET}'
|
||||
|
||||
# Add extra fields
|
||||
extra_parts = []
|
||||
for key, value in record.__dict__.items():
|
||||
if key not in [
|
||||
'name',
|
||||
'msg',
|
||||
'args',
|
||||
'created',
|
||||
'filename',
|
||||
'funcName',
|
||||
'levelname',
|
||||
'levelno',
|
||||
'lineno',
|
||||
'module',
|
||||
'msecs',
|
||||
'message',
|
||||
'pathname',
|
||||
'process',
|
||||
'processName',
|
||||
'relativeCreated',
|
||||
'thread',
|
||||
'threadName',
|
||||
'exc_info',
|
||||
'exc_text',
|
||||
'stack_info',
|
||||
'app_name',
|
||||
'app_version',
|
||||
'taskName',
|
||||
'color_message',
|
||||
]:
|
||||
value_color = self.RED if key == 'error' else self.DARK_YELLOW
|
||||
extra_parts.append(f'{self.DARK_CYAN}{key}{self.RESET}={value_color}{value}{self.RESET}')
|
||||
|
||||
if extra_parts:
|
||||
message += f' {" ".join(extra_parts)}'
|
||||
|
||||
if record.levelno >= logging.WARNING:
|
||||
location = f'{self.TIME_COLOR}{record.module}:{record.lineno}{self.RESET}'
|
||||
result = f'{timestamp} {level} {location} {message}'
|
||||
else:
|
||||
result = f'{timestamp} {level} {message}'
|
||||
|
||||
if record.exc_info:
|
||||
result += '\n' + self.formatException(record.exc_info)
|
||||
|
||||
return result
|
||||
@@ -0,0 +1,55 @@
|
||||
import json
|
||||
import logging
|
||||
from datetime import UTC, datetime
|
||||
|
||||
|
||||
class JSONFormatter(logging.Formatter):
|
||||
def format(self, record: logging.LogRecord) -> str:
|
||||
log_data = {
|
||||
'timestamp': datetime.fromtimestamp(record.created, UTC).isoformat(),
|
||||
'level': record.levelname,
|
||||
'message': record.getMessage(),
|
||||
'module': record.module,
|
||||
'package': record.name,
|
||||
'app_name': getattr(record, 'app_name', 'unknown'),
|
||||
'app_version': getattr(record, 'app_version', 'unknown'),
|
||||
}
|
||||
|
||||
if record.levelno >= logging.ERROR:
|
||||
log_data['location'] = f'{record.pathname}:{record.lineno}'
|
||||
|
||||
if record.exc_info:
|
||||
exc_type = record.exc_info[0]
|
||||
log_data['error_type'] = exc_type.__name__ if exc_type else 'Unknown'
|
||||
log_data['error_message'] = str(record.exc_info[1])
|
||||
log_data['traceback'] = self.formatException(record.exc_info)
|
||||
|
||||
for key, value in record.__dict__.items():
|
||||
if key not in {
|
||||
'name',
|
||||
'msg',
|
||||
'args',
|
||||
'created',
|
||||
'filename',
|
||||
'funcName',
|
||||
'levelname',
|
||||
'levelno',
|
||||
'lineno',
|
||||
'module',
|
||||
'msecs',
|
||||
'message',
|
||||
'pathname',
|
||||
'process',
|
||||
'processName',
|
||||
'relativeCreated',
|
||||
'thread',
|
||||
'threadName',
|
||||
'exc_info',
|
||||
'exc_text',
|
||||
'stack_info',
|
||||
'app_name',
|
||||
'app_version',
|
||||
}:
|
||||
log_data[key] = value
|
||||
|
||||
return json.dumps(log_data, ensure_ascii=False)
|
||||
@@ -0,0 +1,65 @@
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
|
||||
import pydantic
|
||||
|
||||
from .console_formatter import ColoredConsoleFormatter
|
||||
from .json_formatter import JSONFormatter
|
||||
|
||||
|
||||
class LoggerConfig(pydantic.BaseModel):
|
||||
APP_NAME: str
|
||||
APP_VERSION: str
|
||||
LEVEL: int = logging.INFO
|
||||
PRETTY_CONSOLE: bool = False
|
||||
|
||||
@pydantic.field_validator('APP_VERSION')
|
||||
@classmethod
|
||||
def normalize_app_version(cls, v: str) -> str:
|
||||
parts = v.removeprefix('v').split('.')
|
||||
if len(parts) < 2 or any(not part.isdigit() for part in parts):
|
||||
raise ValueError('APP_VERSION must look like 1.2.0')
|
||||
commit_count = _get_git_commit_count()
|
||||
if not commit_count:
|
||||
return f'v{".".join(parts)}'
|
||||
parts[-1] = commit_count
|
||||
return f'v{".".join(parts)}'
|
||||
|
||||
|
||||
def _get_git_commit_count() -> str | None:
|
||||
commit_count = os.getenv('GIT_COMMIT_COUNT')
|
||||
if commit_count is None:
|
||||
return None
|
||||
normalized = commit_count.strip()
|
||||
return normalized or None
|
||||
|
||||
|
||||
def init(config: LoggerConfig) -> None:
|
||||
root_logger = logging.getLogger()
|
||||
root_logger.setLevel(config.LEVEL)
|
||||
root_logger.handlers.clear()
|
||||
|
||||
handler = logging.StreamHandler(sys.stdout)
|
||||
handler.setLevel(config.LEVEL)
|
||||
|
||||
formatter = ColoredConsoleFormatter() if config.PRETTY_CONSOLE else JSONFormatter()
|
||||
handler.setFormatter(formatter)
|
||||
root_logger.addHandler(handler)
|
||||
|
||||
for logger_name in ['uvicorn', 'uvicorn.access', 'uvicorn.error']:
|
||||
uvicorn_logger = logging.getLogger(logger_name)
|
||||
uvicorn_logger.handlers = [handler]
|
||||
uvicorn_logger.propagate = False
|
||||
|
||||
old_factory = logging.getLogRecordFactory()
|
||||
|
||||
def record_factory(*args: object, **kwargs: object) -> logging.LogRecord:
|
||||
record = old_factory(*args, **kwargs)
|
||||
record.app_name = config.APP_NAME
|
||||
record.app_version = config.APP_VERSION
|
||||
return record
|
||||
|
||||
logging.setLogRecordFactory(record_factory)
|
||||
|
||||
logging.info('Logger initialized', extra={'app': config.APP_NAME, 'version': config.APP_VERSION})
|
||||
Reference in New Issue
Block a user