From b1b624a7b3115e917b138785103fda84716f68ad Mon Sep 17 00:00:00 2001 From: lilly Date: Tue, 19 May 2026 14:57:28 +0200 Subject: [PATCH] api: simplify logging setup --- api/src/dooris_api/__init__.py | 7 +++++++ api/src/dooris_api/app.py | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api/src/dooris_api/__init__.py b/api/src/dooris_api/__init__.py index 8ee8809..139ee17 100644 --- a/api/src/dooris_api/__init__.py +++ b/api/src/dooris_api/__init__.py @@ -1,4 +1,6 @@ import os +import sys +import logging from contextvars import ContextVar from argparse import ArgumentParser, Namespace @@ -72,6 +74,10 @@ def main(): ) args = argp.parse_args() + # setup logging + logging.basicConfig(level=logging.DEBUG, format="[%(levelname)s] %(filename)s: %(message)s") + + # setup app app_config.set(args) import uvicorn from dooris_api.app import app @@ -80,6 +86,7 @@ def main(): from fastapi.staticfiles import StaticFiles app.mount("/", StaticFiles(directory=args.serve_static, html=True), name="static") + # start webserver config = uvicorn.Config(app, port=8000, log_level="debug") server = uvicorn.Server(config) server.run() diff --git a/api/src/dooris_api/app.py b/api/src/dooris_api/app.py index edb338f..7e2a948 100644 --- a/api/src/dooris_api/app.py +++ b/api/src/dooris_api/app.py @@ -22,12 +22,6 @@ logger = logging.getLogger(__name__) async def lifespan(app: FastAPI): app_cfg = app_config.get() - root_logger = logging.getLogger("") - root_logger.setLevel(logging.INFO) - root_logger.addHandler(logging.StreamHandler(sys.stderr)) - app_logger = logging.getLogger("dooris_api") - app_logger.setLevel(logging.DEBUG) - app.extra["oidc_client"] = OpenidClient.from_issuer_url( url=app_cfg.openid_issuer, authentication_redirect_uri=f"{app_cfg.base_url}/auth/login-callback",