Moved logging setup to seperate module
All checks were successful
Build & Publish to GHCR / build (push) Successful in 1m23s
All checks were successful
Build & Publish to GHCR / build (push) Successful in 1m23s
This commit is contained in:
parent
eda004626a
commit
9180315b0b
@ -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
|
||||
|
||||
@ -12,6 +12,7 @@ prometheus_client==0.23.1
|
||||
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
|
||||
requests==2.32.5
|
||||
sgmllib3k==1.0.0
|
||||
sniffio==1.3.1
|
||||
|
||||
@ -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")
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import feedparser
|
||||
import re
|
||||
from logger_handler import setup_logger
|
||||
from simple_logger_handler import setup_logger
|
||||
import time
|
||||
from urllib.error import URLError
|
||||
from typing import Tuple
|
||||
|
||||
@ -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
|
||||
@ -2,7 +2,7 @@ from fastapi import FastAPI, Depends, HTTPException, Response, Request
|
||||
import uvicorn
|
||||
from contextlib import asynccontextmanager
|
||||
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 feed_handler import grab_latest_chapter_information
|
||||
from send_notification import send_notification
|
||||
from metrics_server import REQUEST_COUNTER
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
from logger_handler import setup_logger
|
||||
from simple_logger_handler import setup_logger
|
||||
|
||||
logger = setup_logger(__name__)
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ from fastapi import HTTPException
|
||||
from secret_handler import return_credentials
|
||||
import os
|
||||
import time
|
||||
from logger_handler import setup_logger
|
||||
from simple_logger_handler import setup_logger
|
||||
|
||||
|
||||
backend_api_url=os.getenv("BACKEND_API_URL","localhost:8101/internal/receive-notifications")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user