diff --git a/app/dependencies.py b/app/dependencies.py index bf3fe2ef..ded80166 100644 --- a/app/dependencies.py +++ b/app/dependencies.py @@ -4,6 +4,7 @@ from fastapi.templating import Jinja2Templates from app import config +from app.internal.logger_customizer import LoggerCustomizer APP_PATH = os.path.dirname(os.path.realpath(__file__)) @@ -13,6 +14,14 @@ templates = Jinja2Templates(directory=TEMPLATES_PATH) +# Configure logger +logger = LoggerCustomizer.make_logger(config.LOG_PATH, + config.LOG_FILENAME, + config.LOG_LEVEL, + config.LOG_ROTATION_INTERVAL, + config.LOG_RETENTION_INTERVAL, + config.LOG_FORMAT) + @lru_cache() def get_settings(): diff --git a/app/main.py b/app/main.py index 0a9d3657..4bface4f 100644 --- a/app/main.py +++ b/app/main.py @@ -6,15 +6,13 @@ from app.database import models from app.database.database import engine, get_db from app.dependencies import ( - MEDIA_PATH, STATIC_PATH, templates) + MEDIA_PATH, STATIC_PATH, templates, logger) from app.internal.quotes import load_quotes, daily_quotes from app.routers import ( agenda, dayview, email, event, invitation, profile, search, telegram, whatsapp ) from app.telegram.bot import telegram_bot -from app.internal.logger_customizer import LoggerCustomizer -from app import config def create_tables(engine, psql_environment): @@ -35,14 +33,6 @@ def create_tables(engine, psql_environment): load_quotes.load_daily_quotes(next(get_db())) -# Configure logger -logger = LoggerCustomizer.make_logger(config.LOG_PATH, - config.LOG_FILENAME, - config.LOG_LEVEL, - config.LOG_ROTATION_INTERVAL, - config.LOG_RETENTION_INTERVAL, - config.LOG_FORMAT) -app.logger = logger app.include_router(profile.router) app.include_router(event.router) @@ -60,7 +50,7 @@ def create_tables(engine, psql_environment): # TODO: I add the quote day to the home page # until the relavent calendar view will be developed. @app.get("/") -@app.logger.catch() +@logger.catch() async def home(request: Request, db: Session = Depends(get_db)): quote = daily_quotes.quote_per_day(db) return templates.TemplateResponse("home.html", {