From b12bb3324265eaac2a15d73a39b7a4f5b474acff Mon Sep 17 00:00:00 2001 From: Zakhar Izmaylov Date: Sat, 9 Nov 2024 11:41:48 +0300 Subject: [PATCH] Migrate logging for loguru --- backup.py | 5 +---- client.py | 5 +---- handlers/admin/admin.py | 5 +---- handlers/admin/user_editor.py | 5 +---- handlers/commands.py | 5 +---- handlers/keys/key_management.py | 5 +---- handlers/keys/keys.py | 4 +--- handlers/keys/subscriptions.py | 5 +---- handlers/keys/trial_key.py | 5 +---- handlers/notifications.py | 5 +---- handlers/payment/freekassa_pay.py | 4 +--- handlers/payment/yookassa_pay.py | 5 +---- handlers/profile.py | 4 +--- handlers/start.py | 4 +--- requirements.txt | 1 + 15 files changed, 15 insertions(+), 52 deletions(-) diff --git a/backup.py b/backup.py index 5c65b05d..b36a1e30 100644 --- a/backup.py +++ b/backup.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger import os import subprocess from datetime import datetime @@ -7,9 +7,6 @@ from aiogram.types import BufferedInputFile from config import ADMIN_ID, BACK_DIR, DB_NAME, DB_PASSWORD, DB_USER -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - async def backup_database(): from bot import bot diff --git a/client.py b/client.py index af1c569f..cc0ae069 100644 --- a/client.py +++ b/client.py @@ -1,11 +1,8 @@ import json -import logging +from loguru import logger from config import SERVERS -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - async def add_client( session, diff --git a/handlers/admin/admin.py b/handlers/admin/admin.py index 7890d688..b901e0fe 100644 --- a/handlers/admin/admin.py +++ b/handlers/admin/admin.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger from datetime import datetime import asyncpg @@ -17,9 +17,6 @@ from database import ( ) from middlewares.admin import admin_only -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - router = Router() diff --git a/handlers/admin/user_editor.py b/handlers/admin/user_editor.py index 79f2e1d3..c16d06aa 100644 --- a/handlers/admin/user_editor.py +++ b/handlers/admin/user_editor.py @@ -1,5 +1,5 @@ import asyncio -import logging +from loguru import logger from datetime import datetime import asyncpg @@ -16,9 +16,6 @@ from database import get_client_id_by_email, get_tg_id_by_client_id, update_key_ from handlers.admin.admin_panel import back_to_admin_menu from handlers.utils import sanitize_key_name -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - router = Router() diff --git a/handlers/commands.py b/handlers/commands.py index 0b221eac..de7aece3 100644 --- a/handlers/commands.py +++ b/handlers/commands.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger import asyncpg from aiogram import F, Router, types @@ -19,9 +19,6 @@ from handlers.profile import process_callback_view_profile from handlers.start import start_command from handlers.texts import TRIAL -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - router = Router() diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py index 092088f3..324c6d22 100644 --- a/handlers/keys/key_management.py +++ b/handlers/keys/key_management.py @@ -1,5 +1,5 @@ import asyncio -import logging +from loguru import logger import uuid from datetime import datetime, timedelta @@ -39,9 +39,6 @@ from handlers.utils import sanitize_key_name router = Router() -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - class Form(StatesGroup): waiting_for_server_selection = State() diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index 2d630365..8d51d62e 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -1,6 +1,6 @@ import asyncio import locale -import logging +from loguru import logger import os from datetime import datetime, timedelta @@ -40,8 +40,6 @@ locale.setlocale(locale.LC_TIME, "ru_RU.UTF-8") router = Router() -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) @router.callback_query(F.data == "view_keys") diff --git a/handlers/keys/subscriptions.py b/handlers/keys/subscriptions.py index ae6e346e..8ede7370 100644 --- a/handlers/keys/subscriptions.py +++ b/handlers/keys/subscriptions.py @@ -1,14 +1,11 @@ import base64 -import logging +from loguru import logger import aiohttp from aiohttp import web from config import SERVERS -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - async def fetch_url_content(url): try: diff --git a/handlers/keys/trial_key.py b/handlers/keys/trial_key.py index 2e08f25c..70c87292 100644 --- a/handlers/keys/trial_key.py +++ b/handlers/keys/trial_key.py @@ -1,5 +1,5 @@ import asyncio -import logging +from loguru import logger import uuid from datetime import datetime, timedelta @@ -12,9 +12,6 @@ from database import store_key from handlers.texts import INSTRUCTIONS from handlers.utils import generate_random_email -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - async def create_trial_key(tg_id: int): conn = await asyncpg.connect(DATABASE_URL) diff --git a/handlers/notifications.py b/handlers/notifications.py index 2d63e90d..56813a53 100644 --- a/handlers/notifications.py +++ b/handlers/notifications.py @@ -1,5 +1,5 @@ import asyncio -import logging +from loguru import logger from datetime import datetime, timedelta import asyncpg @@ -18,9 +18,6 @@ from handlers.texts import ( RENEWAL_PLANS, ) -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - router = Router() diff --git a/handlers/payment/freekassa_pay.py b/handlers/payment/freekassa_pay.py index 4f3d200e..cf2cc946 100644 --- a/handlers/payment/freekassa_pay.py +++ b/handlers/payment/freekassa_pay.py @@ -1,5 +1,5 @@ import hashlib -import logging +from loguru import logger import time import uuid @@ -17,8 +17,6 @@ from handlers.profile import process_callback_view_profile from handlers.texts import PAYMENT_OPTIONS router = Router() -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) class ReplenishBalanceState(StatesGroup): diff --git a/handlers/payment/yookassa_pay.py b/handlers/payment/yookassa_pay.py index 2e1c7983..433d3935 100644 --- a/handlers/payment/yookassa_pay.py +++ b/handlers/payment/yookassa_pay.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger import uuid from aiogram import Router, types, F @@ -21,9 +21,6 @@ from handlers.texts import PAYMENT_OPTIONS router = Router() -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) - Configuration.account_id = YOOKASSA_SHOP_ID Configuration.secret_key = YOOKASSA_SECRET_KEY diff --git a/handlers/profile.py b/handlers/profile.py index f2b8ad2e..6b3806f0 100644 --- a/handlers/profile.py +++ b/handlers/profile.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger import os from aiogram import Router, types,F @@ -24,8 +24,6 @@ class ReplenishBalanceState(StatesGroup): router = Router() -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) async def process_callback_view_profile( diff --git a/handlers/start.py b/handlers/start.py index 0ed2f925..3c00b6a5 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger import os import asyncpg @@ -19,8 +19,6 @@ from database import add_connection, add_referral, check_connection_exists, get_ from handlers.keys.trial_key import create_trial_key from handlers.texts import ABOUT_VPN, INSTRUCTIONS_TRIAL, WELCOME_TEXT -logging.basicConfig(level=logging.DEBUG) -logger = logging.getLogger(__name__) router = Router() diff --git a/requirements.txt b/requirements.txt index be80c6a0..4e86dd62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,3 +25,4 @@ urllib3==2.2.3 wrapt==1.16.0 yarl==1.15.5 yookassa==3.3.0 +loguru \ No newline at end of file