From fce74a0016ac9effee45195bf0f4628011cc495f Mon Sep 17 00:00:00 2001
From: Jakub Miazek <the@grillazz.com>
Date: Sat, 3 Jun 2023 15:34:31 +0200
Subject: [PATCH] logger refactor

---
 app/api/stuff.py                     | 2 +-
 app/database.py                      | 2 +-
 app/main.py                          | 2 +-
 app/utils/__init__.py                | 0
 app/{ => utils}/logging.py           | 2 +-
 app/{utils.py => utils/singleton.py} | 0
 config.ini                           | 6 +++---
 7 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 app/utils/__init__.py
 rename app/{ => utils}/logging.py (91%)
 rename app/{utils.py => utils/singleton.py} (100%)

diff --git a/app/api/stuff.py b/app/api/stuff.py
index 9de1917..6f60f6e 100644
--- a/app/api/stuff.py
+++ b/app/api/stuff.py
@@ -5,7 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.database import get_db
 from app.models.stuff import Stuff
 from app.schemas.stuff import StuffResponse, StuffSchema
-from app.logging import AppLogger
+from app.utils.logging import AppLogger
 
 logger = AppLogger.__call__().get_logger()
 
diff --git a/app/database.py b/app/database.py
index 621cbe1..8ebd60f 100644
--- a/app/database.py
+++ b/app/database.py
@@ -4,7 +4,7 @@ from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
 from sqlalchemy.orm import sessionmaker
 
 from app import config
-from app.logging import AppLogger
+from app.utils.logging import AppLogger
 
 global_settings = config.get_settings()
 logger = AppLogger.__call__().get_logger()
diff --git a/app/main.py b/app/main.py
index 16ace8e..7a9e766 100644
--- a/app/main.py
+++ b/app/main.py
@@ -3,7 +3,7 @@ from fastapi import FastAPI
 from app.api.nonsense import router as nonsense_router
 from app.api.shakespeare import router as shakespeare_router
 from app.api.stuff import router as stuff_router
-from app.logging import AppLogger
+from app.utils.logging import AppLogger
 
 logger = AppLogger.__call__().get_logger()
 
diff --git a/app/utils/__init__.py b/app/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/logging.py b/app/utils/logging.py
similarity index 91%
rename from app/logging.py
rename to app/utils/logging.py
index 9815e7c..e6aec43 100644
--- a/app/logging.py
+++ b/app/utils/logging.py
@@ -4,7 +4,7 @@ from rich.console import Console
 from rich.logging import RichHandler
 
 
-from app.utils import SingletonMeta
+from app.utils.singleton import SingletonMeta
 
 
 class AppLogger(metaclass=SingletonMeta):
diff --git a/app/utils.py b/app/utils/singleton.py
similarity index 100%
rename from app/utils.py
rename to app/utils/singleton.py
diff --git a/config.ini b/config.ini
index 103ebaa..c40c808 100644
--- a/config.ini
+++ b/config.ini
@@ -25,20 +25,20 @@ handlers = uvicorn
 qualname = uvicorn.access
 
 [handler_stream]
-class = app.logging.RichConsoleHandler
+class = app.utils.logging.RichConsoleHandler
 kwargs = {"omit_repeated_times":True, "show_time": False, "enable_link_path": False, "tracebacks_show_locals": True}
 args = (100, "white")
 formatter = default
 stream = ext://sys.stdout
 
 [handler_sqlalchemy]
-class = app.logging.RichConsoleHandler
+class = app.utils.logging.RichConsoleHandler
 kwargs = {"omit_repeated_times":True, "show_time": False, "enable_link_path": False, "tracebacks_show_locals": True}
 args = (100, "magenta")
 formatter = default
 
 [handler_uvicorn]
-class = app.logging.RichConsoleHandler
+class = app.utils.logging.RichConsoleHandler
 kwargs = {"omit_repeated_times":True, "show_time": False, "enable_link_path": False, "tracebacks_show_locals": True}
 args = (100, "yellow")
 formatter = default