Moved logging setupt to seperate module
All checks were successful
Build & Publish to GHCR / build (push) Successful in 1m11s
All checks were successful
Build & Publish to GHCR / build (push) Successful in 1m11s
This commit is contained in:
parent
9f76821ca8
commit
db118cce55
@ -1,5 +1,7 @@
|
|||||||
FROM python:3.12-slim
|
FROM python:3.12-slim
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y git
|
||||||
|
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
|
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|||||||
@ -18,6 +18,7 @@ pycparser==2.23
|
|||||||
pydantic==2.12.0
|
pydantic==2.12.0
|
||||||
pydantic_core==2.41.1
|
pydantic_core==2.41.1
|
||||||
python-json-logger==4.0.0
|
python-json-logger==4.0.0
|
||||||
|
simple-logger-handler @ git+https://git.gansejunge.com/notifier/lib-logger-handler.git@main
|
||||||
sniffio==1.3.1
|
sniffio==1.3.1
|
||||||
starlette==0.48.0
|
starlette==0.48.0
|
||||||
typing-inspection==0.4.2
|
typing-inspection==0.4.2
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import threading
|
|||||||
from secret_handler import return_credentials
|
from secret_handler import return_credentials
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
from logger_handler import setup_logger
|
from simple_logger_handler import setup_logger
|
||||||
|
|
||||||
db_username = return_credentials("/etc/secrets/db_username")
|
db_username = return_credentials("/etc/secrets/db_username")
|
||||||
db_password = return_credentials("/etc/secrets/db_password")
|
db_password = return_credentials("/etc/secrets/db_password")
|
||||||
|
|||||||
@ -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
|
|
||||||
@ -6,7 +6,7 @@ from typing import Dict
|
|||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from validator import verify_api_key
|
from validator import verify_api_key
|
||||||
from db import get_db, create_connection_pool, close_connection_pool, start_healthcheck_thread
|
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
|
from rabbitmq_handler import RabbitMQProducer
|
||||||
import uvicorn
|
import uvicorn
|
||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import aio_pika
|
|||||||
from aio_pika.exceptions import AMQPException
|
from aio_pika.exceptions import AMQPException
|
||||||
from secret_handler import return_credentials
|
from secret_handler import return_credentials
|
||||||
import os
|
import os
|
||||||
from logger_handler import setup_logger
|
from simple_logger_handler import setup_logger
|
||||||
import json
|
import json
|
||||||
|
|
||||||
logger = setup_logger(__name__)
|
logger = setup_logger(__name__)
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
from logger_handler import setup_logger
|
from simple_logger_handler import setup_logger
|
||||||
|
|
||||||
logger = setup_logger(__name__)
|
logger = setup_logger(__name__)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user