From 52b1c6b3651e1fd608496481c6abefdb2dcaf0a5 Mon Sep 17 00:00:00 2001 From: grucshetskyaleksei Date: Tue, 26 Sep 2023 02:23:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D1=80=D1=85=D0=B8=D1=82=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D1=83=D1=80=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fastapi_app/bin/__main__.py | 2 +- src/fastapi_app/lib/api/v1/dependencies/__init__.py | 1 + .../lib/api/v1/{services => dependencies}/token.py | 2 +- .../lib/api/v1/{handlers => endpoints}/__init__.py | 0 .../lib/api/v1/{handlers => endpoints}/health/__init__.py | 0 .../v1/{handlers => endpoints}/health/liveness_probe.py | 0 src/fastapi_app/lib/app/app.py | 5 +++-- src/fastapi_app/lib/app/logger.py | 8 ++++---- src/python-service/lib/app/app.py | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 src/fastapi_app/lib/api/v1/dependencies/__init__.py rename src/fastapi_app/lib/api/v1/{services => dependencies}/token.py (94%) rename src/fastapi_app/lib/api/v1/{handlers => endpoints}/__init__.py (100%) rename src/fastapi_app/lib/api/v1/{handlers => endpoints}/health/__init__.py (100%) rename src/fastapi_app/lib/api/v1/{handlers => endpoints}/health/liveness_probe.py (100%) diff --git a/src/fastapi_app/bin/__main__.py b/src/fastapi_app/bin/__main__.py index f1728ce..2ccdc06 100644 --- a/src/fastapi_app/bin/__main__.py +++ b/src/fastapi_app/bin/__main__.py @@ -25,7 +25,7 @@ async def main(): except KeyboardInterrupt: logger.info("Exited with keyboard interruption") except Exception as e: - logger.exception("Unexpected error occurred") + logger.exception(f"Unexpected error occurred: {e}") if __name__ == "__main__": diff --git a/src/fastapi_app/lib/api/v1/dependencies/__init__.py b/src/fastapi_app/lib/api/v1/dependencies/__init__.py new file mode 100644 index 0000000..4b2f4af --- /dev/null +++ b/src/fastapi_app/lib/api/v1/dependencies/__init__.py @@ -0,0 +1 @@ +from .token import * diff --git a/src/fastapi_app/lib/api/v1/services/token.py b/src/fastapi_app/lib/api/v1/dependencies/token.py similarity index 94% rename from src/fastapi_app/lib/api/v1/services/token.py rename to src/fastapi_app/lib/api/v1/dependencies/token.py index ffa1e02..6e37532 100644 --- a/src/fastapi_app/lib/api/v1/services/token.py +++ b/src/fastapi_app/lib/api/v1/dependencies/token.py @@ -2,7 +2,7 @@ import fastapi from jose import JWTError, jwt from pydantic import ValidationError -import lib.api.v1.schemas as app_schemas +import lib.api.schemas as app_schemas import lib.app.settings as app_settings settings = app_settings.get_settings() diff --git a/src/fastapi_app/lib/api/v1/handlers/__init__.py b/src/fastapi_app/lib/api/v1/endpoints/__init__.py similarity index 100% rename from src/fastapi_app/lib/api/v1/handlers/__init__.py rename to src/fastapi_app/lib/api/v1/endpoints/__init__.py diff --git a/src/fastapi_app/lib/api/v1/handlers/health/__init__.py b/src/fastapi_app/lib/api/v1/endpoints/health/__init__.py similarity index 100% rename from src/fastapi_app/lib/api/v1/handlers/health/__init__.py rename to src/fastapi_app/lib/api/v1/endpoints/health/__init__.py diff --git a/src/fastapi_app/lib/api/v1/handlers/health/liveness_probe.py b/src/fastapi_app/lib/api/v1/endpoints/health/liveness_probe.py similarity index 100% rename from src/fastapi_app/lib/api/v1/handlers/health/liveness_probe.py rename to src/fastapi_app/lib/api/v1/endpoints/health/liveness_probe.py diff --git a/src/fastapi_app/lib/app/app.py b/src/fastapi_app/lib/app/app.py index af43ed5..9f2db82 100644 --- a/src/fastapi_app/lib/app/app.py +++ b/src/fastapi_app/lib/app/app.py @@ -3,7 +3,7 @@ import logging.config as logging_config import fastapi -import lib.api.v1.handlers as api_v1_handlers +import lib.api.v1.endpoints as api_v1_endpoints from .logger import LOGGING from .settings import get_settings @@ -43,8 +43,9 @@ class Application: # Handlers + app.include_router(api_v1_endpoints.health.health_router, prefix="/api/v1/health", tags=["health"]) + logger.info("Initializing handlers") - app.include_router(api_v1_handlers.health.health_router, prefix="/api/v1/health", tags=["health"]) logger.info("Initializing application finished") diff --git a/src/fastapi_app/lib/app/logger.py b/src/fastapi_app/lib/app/logger.py index b90a8a1..6db0eb9 100644 --- a/src/fastapi_app/lib/app/logger.py +++ b/src/fastapi_app/lib/app/logger.py @@ -30,7 +30,7 @@ LOGGING = { "fmt": "%(levelprefix)s %(client_addr)s - '%(request_line)s' %(status_code)s", }, }, - "handlers": { + "endpoints": { "console": { "level": log_settings.log_level_handlers, "class": "logging.StreamHandler", @@ -49,14 +49,14 @@ LOGGING = { }, "loggers": { "": { - "handlers": log_settings.log_default_handlers, + "endpoints": log_settings.log_default_handlers, "level": log_settings.log_level_loggers, }, "uvicorn.error": { "level": log_settings.log_level_loggers, }, "uvicorn.access": { - "handlers": ["access"], + "endpoints": ["access"], "level": log_settings.log_level_loggers, "propagate": False, }, @@ -64,6 +64,6 @@ LOGGING = { "root": { "level": log_settings.log_level_root, "formatter": "verbose", - "handlers": log_settings.log_default_handlers, + "endpoints": log_settings.log_default_handlers, }, } diff --git a/src/python-service/lib/app/app.py b/src/python-service/lib/app/app.py index c92b262..dd66beb 100644 --- a/src/python-service/lib/app/app.py +++ b/src/python-service/lib/app/app.py @@ -63,7 +63,7 @@ class Application: # Handlers - logger.info("Initializing handlers") + logger.info("Initializing endpoints") liveness_probe_handler = health_handlers.LivenessProbeHandler() logger.info("Creating application")