refactor: update logging configuration for Alembic and RQ worker to unify logger formatting and level

This commit is contained in:
zurdi
2025-05-09 15:33:45 +00:00
parent 1b38607eab
commit a9ac01cd07
4 changed files with 31 additions and 32 deletions

View File

@@ -2,7 +2,7 @@
# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
version: 0.1
cli:
version: 1.22.12
version: 1.22.15
# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
plugins:
sources:
@@ -21,25 +21,25 @@ lint:
- pyright
enabled:
- markdownlint@0.44.0
- eslint@9.25.1
- eslint@9.26.0
- actionlint@1.7.7
- bandit@1.8.3
- black@25.1.0
- checkov@3.2.408
- checkov@3.2.416
- git-diff-check
- isort@6.0.1
- mypy@1.15.0
- osv-scanner@2.0.1
- oxipng@9.1.4
- osv-scanner@2.0.2
- oxipng@9.1.5
- prettier@3.5.3
- ruff@0.11.6
- ruff@0.11.8
- shellcheck@0.10.0
- shfmt@3.6.0
- svgo@3.3.2
- taplo@0.9.3
- trivy@0.61.1
- trufflehog@3.88.25
- yamllint@1.37.0
- trivy@0.62.1
- trufflehog@3.88.29
- yamllint@1.37.1
ignore:
- linters: [ALL]
paths:

View File

@@ -1,11 +1,10 @@
import logging
import sys
from logging.config import fileConfig
from pathlib import Path
from alembic import context
from config.config_manager import ConfigManager
from logger.logger import log
from logger.logger import unify_logger
from models.assets import Save, Screenshot, State # noqa
from models.base import BaseModel
from models.collection import VirtualCollection
@@ -19,16 +18,7 @@ from sqlalchemy import create_engine
# access to the values within the .ini file in use.
config = context.config
# logger formatting
alembic_logger = logging.getLogger("alembic")
alembic_logger.setLevel(log.level)
if not alembic_logger.hasHandlers():
for handler in log.handlers:
alembic_logger.addHandler(handler)
else:
for handler in alembic_logger.handlers:
handler.setFormatter(log.handlers[0].formatter)
unify_logger("alembic")
# add your model's MetaData object here
# for 'autogenerate' support

View File

@@ -16,3 +16,21 @@ if not log.hasHandlers():
# Hush passlib warnings
logging.getLogger("passlib").setLevel(logging.ERROR)
def unify_logger(logger: str) -> None:
"""
Unify the logger to use the same format and level as the main logger.
Args:
logger (str): The name of the logger to unify.
"""
alembic_logger = logging.getLogger(logger)
alembic_logger.setLevel(log.level)
if not alembic_logger.hasHandlers():
for handler in log.handlers:
alembic_logger.addHandler(handler)
else:
for handler in alembic_logger.handlers:
handler.setFormatter(log.handlers[0].formatter)

View File

@@ -3,20 +3,11 @@ import logging
import sentry_sdk
from config import SENTRY_DSN
from handler.redis_handler import redis_client
from logger.logger import log
from logger.logger import log, unify_logger
from rq import Queue, Worker
from utils import get_version
# logger formatting
rq_logger = logging.getLogger("rq.worker")
rq_logger.setLevel(log.level)
if not rq_logger.hasHandlers():
for handler in log.handlers:
rq_logger.addHandler(handler)
else:
for handler in rq_logger.handlers:
handler.setFormatter(log.handlers[0].formatter)
unify_logger("rq.worker")
listen = ("high", "default", "low")