fix(log): replace logger with loguru (again!)

This commit is contained in:
2025-10-26 23:09:42 +03:00
parent 9ecb6a83ba
commit 72f766ab46
6 changed files with 14 additions and 25 deletions
+9 -10
View File
@@ -1,6 +1,6 @@
import psycopg2 import psycopg2
import os import os
import logging from loguru import logger
from contextlib import contextmanager from contextlib import contextmanager
from typing import Generator from typing import Generator
@@ -8,8 +8,6 @@ from utils.loadDotEnv import initializeENV
initializeENV() initializeENV()
logger = logging.getLogger(__name__)
def PSQLConnect(): def PSQLConnect():
conn = psycopg2.connect(os.getenv('POSTDRESS_CONNECTION')) conn = psycopg2.connect(os.getenv('POSTDRESS_CONNECTION'))
return conn return conn
@@ -24,16 +22,16 @@ def get_connection() -> Generator[psycopg2.extensions.connection, None, None]:
conn = None conn = None
try: try:
conn = PSQLConnect() conn = PSQLConnect()
logger.debug("Подключение к БД установлено") logger.info("Подключение к БД установлено")
yield conn yield conn
except psycopg2.OperationalError as e: except psycopg2.OperationalError as e:
logger.error(f"Ошибка подключения к БД: {e}") logger.error(f"Ошибка подключения к БД:\n{e}")
raise raise
except psycopg2.Error as e: except psycopg2.Error as e:
logger.error(f"Ошибка PostgreSQL: {e}") logger.error(f"Ошибка PostgreSQL:\n{e}")
raise raise
except Exception as e: except Exception as e:
logger.error(f"Неожиданная ошибка при работе с БД: {e}") logger.error(f"Неожиданная ошибка при работе с БД:\n{e}")
raise raise
finally: finally:
if conn: if conn:
@@ -41,7 +39,7 @@ def get_connection() -> Generator[psycopg2.extensions.connection, None, None]:
conn.close() conn.close()
logger.debug("Соединение с БД закрыто") logger.debug("Соединение с БД закрыто")
except Exception as e: except Exception as e:
logger.warning(f"Ошибка при закрытии соединения: {e}") logger.warning(f"Ошибка при закрытии соединения:\n{e}")
def test_connection() -> bool: def test_connection() -> bool:
try: try:
@@ -56,6 +54,7 @@ def test_connection() -> bool:
cur.close() cur.close()
logger.debug("Курсор закрыт") logger.debug("Курсор закрыт")
except Exception as e: except Exception as e:
logger.error(f"Тест подключения к БД провален: {e}") logger.error(f"Тест подключения к БД провален:\n{e}")
return False return False
print(test_connection())
logger.debug(test_connection())
+1 -3
View File
@@ -1,11 +1,9 @@
from typing import List, Optional from typing import List, Optional
from datetime import datetime, date from datetime import datetime, date
import logging from loguru import logger
from db.connection import get_connection from db.connection import get_connection
from model.ai_prediction import AIPrediction from model.ai_prediction import AIPrediction
logger = logging.getLogger(__name__)
class AIPredictionsRepository: class AIPredictionsRepository:
def get_all(self) -> List[AIPrediction]: def get_all(self) -> List[AIPrediction]:
try: try:
+1 -3
View File
@@ -1,12 +1,10 @@
# db/repositories/inventory_repository.py # db/repositories/inventory_repository.py
from typing import List, Optional, Tuple from typing import List, Optional, Tuple
from datetime import datetime from datetime import datetime
import logging from loguru import logger
from db.connection import get_connection from db.connection import get_connection
from model.inventory import InventoryRecord from model.inventory import InventoryRecord
logger = logging.getLogger(__name__)
class InventoryRepository: class InventoryRepository:
def get_all(self) -> List[InventoryRecord]: def get_all(self) -> List[InventoryRecord]:
try: try:
+1 -3
View File
@@ -1,10 +1,8 @@
from typing import List, Optional from typing import List, Optional
import logging from loguru import logger
from db.connection import get_connection from db.connection import get_connection
from model.product import Product from model.product import Product
logger = logging.getLogger(__name__)
class ProductRepository: class ProductRepository:
def get_all(self) -> List[Product]: def get_all(self) -> List[Product]:
try: try:
+1 -3
View File
@@ -1,10 +1,8 @@
from typing import List, Optional from typing import List, Optional
import logging from loguru import logger
from db.connection import get_connection from db.connection import get_connection
from model.robot import Robot from model.robot import Robot
logger = logging.getLogger(__name__)
class RobotRepository: class RobotRepository:
def get_all(self) -> List[Robot]: def get_all(self) -> List[Robot]:
try: try:
+1 -3
View File
@@ -1,10 +1,8 @@
from typing import List, Optional from typing import List, Optional
import logging from loguru import logger
from model.user import User from model.user import User
from db.connection import get_connection from db.connection import get_connection
logger = logging.getLogger(__name__)
class UserRepository: class UserRepository:
def get_all(self) -> List[User]: def get_all(self) -> List[User]:
try: try: