diff --git a/Dockerfile b/Dockerfile index a54e052..bf6c867 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM python:3.12-slim +RUN apt-get update && apt-get install -y git + COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt diff --git a/requirements.txt b/requirements.txt index e1d082c..312ee24 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ pycparser==2.23 pydantic==2.12.0 pydantic_core==2.41.1 python-json-logger==4.0.0 +simple-logger-handler @ git+https://git.gansejunge.com/notifier/lib-logger-handler.git@main sniffio==1.3.1 starlette==0.48.0 typing-inspection==0.4.2 diff --git a/src/db.py b/src/db.py index 7d4dd8c..84da86d 100644 --- a/src/db.py +++ b/src/db.py @@ -3,7 +3,7 @@ import threading from secret_handler import return_credentials import os import time -from logger_handler import setup_logger +from simple_logger_handler import setup_logger db_username = return_credentials("/etc/secrets/db_username") db_password = return_credentials("/etc/secrets/db_password") diff --git a/src/logger_handler.py b/src/logger_handler.py deleted file mode 100644 index c504d1e..0000000 --- a/src/logger_handler.py +++ /dev/null @@ -1,30 +0,0 @@ -import os -import logging - -try: - from pythonjsonlogger import jsonlogger - JSON_LOGGING = True -except ImportError: - JSON_LOGGING = False - -LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO").upper() -if LOG_LEVEL not in {"ERROR", "DEBUG", "INFO", "WARNING", "CRITICAL"}: - LOG_LEVEL = "INFO" - -def setup_logger(name: str) -> logging.Logger: - logger = logging.getLogger(name) - if not logger.handlers: - handler = logging.StreamHandler() - if JSON_LOGGING: - formatter = jsonlogger.JsonFormatter( - "%(asctime)s %(name)s %(levelname)s %(message)s" - ) - else: - formatter = logging.Formatter( - "%(asctime)s - %(name)s - %(levelname)s - %(message)s" - ) - handler.setFormatter(formatter) - logger.addHandler(handler) - logger.setLevel(getattr(logging, LOG_LEVEL)) - logger.debug(f"Logger {name} initialized with level {LOG_LEVEL}") - return logger diff --git a/src/main.py b/src/main.py index b847442..eb90862 100644 --- a/src/main.py +++ b/src/main.py @@ -6,7 +6,7 @@ from typing import Dict from pydantic import BaseModel from validator import verify_api_key from db import get_db, create_connection_pool, close_connection_pool, start_healthcheck_thread -from logger_handler import setup_logger, LOG_LEVEL +from simple_logger_handler import setup_logger, LOG_LEVEL from rabbitmq_handler import RabbitMQProducer import uvicorn from contextlib import asynccontextmanager diff --git a/src/rabbitmq_handler.py b/src/rabbitmq_handler.py index 5cf8c0e..6e818df 100644 --- a/src/rabbitmq_handler.py +++ b/src/rabbitmq_handler.py @@ -3,7 +3,7 @@ import aio_pika from aio_pika.exceptions import AMQPException from secret_handler import return_credentials import os -from logger_handler import setup_logger +from simple_logger_handler import setup_logger import json logger = setup_logger(__name__) diff --git a/src/secret_handler.py b/src/secret_handler.py index 2f0d133..696f176 100644 --- a/src/secret_handler.py +++ b/src/secret_handler.py @@ -1,4 +1,4 @@ -from logger_handler import setup_logger +from simple_logger_handler import setup_logger logger = setup_logger(__name__)