From 1b38607eab85d33bd593e96268edb9a40b6bcd84 Mon Sep 17 00:00:00 2001 From: zurdi Date: Fri, 9 May 2025 15:23:32 +0000 Subject: [PATCH] refactor: update Alembic logging configuration and add ASCII art banner to init script --- backend/alembic.ini | 37 +------------------------------------ backend/alembic/env.py | 16 ++++++++++++---- backend/worker.py | 7 +------ docker/init_scripts/init | 9 +++++++++ 4 files changed, 23 insertions(+), 46 deletions(-) diff --git a/backend/alembic.ini b/backend/alembic.ini index 051854d0b..3944cdf1d 100644 --- a/backend/alembic.ini +++ b/backend/alembic.ini @@ -63,7 +63,7 @@ version_path_separator = os # Use os.pathsep. Default configuration used for ne sqlalchemy.url = '' -[post_write_hooks] +; [post_write_hooks] # post_write_hooks defines scripts or Python functions that are run # on newly generated revision scripts. See the documentation for further # detail and examples @@ -73,38 +73,3 @@ sqlalchemy.url = '' # black.type = console_scripts # black.entrypoint = black # black.options = -l 79 REVISION_SCRIPT_FILENAME - -# Logging configuration -[loggers] -keys = root,sqlalchemy,alembic - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = WARN -handlers = console -qualname = - -[logger_sqlalchemy] -level = WARN -handlers = -qualname = sqlalchemy.engine - -[logger_alembic] -level = INFO -handlers = -qualname = alembic - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(levelname)s: [RomM][%(name)s] %(message)s -datefmt = %H:%M:%S diff --git a/backend/alembic/env.py b/backend/alembic/env.py index d99ef2fb5..110a5ddad 100644 --- a/backend/alembic/env.py +++ b/backend/alembic/env.py @@ -1,9 +1,11 @@ +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 models.assets import Save, Screenshot, State # noqa from models.base import BaseModel from models.collection import VirtualCollection @@ -17,10 +19,16 @@ from sqlalchemy import create_engine # access to the values within the .ini file in use. config = context.config -# Interpret the config file for Python logging. -# This line sets up loggers basically. -if config.config_file_name is not None: - fileConfig(config.config_file_name, disable_existing_loggers=False) +# 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) # add your model's MetaData object here # for 'autogenerate' support diff --git a/backend/worker.py b/backend/worker.py index cbccd47e1..83eabfaf1 100644 --- a/backend/worker.py +++ b/backend/worker.py @@ -7,19 +7,14 @@ from logger.logger import log from rq import Queue, Worker from utils import get_version -# Get the rq.worker logger +# logger formatting rq_logger = logging.getLogger("rq.worker") - -# Set its level (optional; you can match your app's LOGLEVEL if you want) rq_logger.setLevel(log.level) -# Apply the same formatter to rq.worker handlers if not rq_logger.hasHandlers(): - # You can reuse the same handler as your app logger OR create a new one for handler in log.handlers: rq_logger.addHandler(handler) else: - # If rq.worker already has handlers, just update their formatter for handler in rq_logger.handlers: handler.setFormatter(log.handlers[0].formatter) diff --git a/docker/init_scripts/init b/docker/init_scripts/init index 1ad6b7d13..53e10538b 100755 --- a/docker/init_scripts/init +++ b/docker/init_scripts/init @@ -205,6 +205,15 @@ shutdown() { stop_process_pid valkey-server } +# ASCII art banner +info_log " _____ __ __ " +info_log '| __ \ | \/ |' +info_log '| |__) |___ _ __ ___ | \ / |' +info_log "| _ // _ \\| '_ \` _ \\| |\\/| |" +info_log '| | \ \ (_) | | | | | | | | |' +info_log '|_| \_\___/|_| |_| |_|_| |_|' +info_log " " + # switch to backend directory cd /backend || { error_log "/backend directory doesn't seem to exist"; }