From eb03b6014de3058199b64fde8deed1fa5adbefb2 Mon Sep 17 00:00:00 2001 From: Zakhar Izmaylov Date: Fri, 31 Jan 2025 06:44:36 +0300 Subject: [PATCH] Fix key renewal and expiry update function signatures - Update `change_expiry_time` to pass session to `update_key_expiry` - Adjust `complete_key_renewal` connection closing order - Minor code structure improvements in key handling functions --- handlers/admin/admin_users.py | 2 +- handlers/keys/keys.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handlers/admin/admin_users.py b/handlers/admin/admin_users.py index 9cf672dc..e73b3fb2 100644 --- a/handlers/admin/admin_users.py +++ b/handlers/admin/admin_users.py @@ -633,7 +633,7 @@ async def change_expiry_time(expiry_time: int, email: str, session: Any) -> Exce await asyncio.gather(*tasks) await update_key_on_all_servers() - await update_key_expiry(client_id, expiry_time) + await update_key_expiry(client_id, expiry_time, session) async def get_user_balance(tg_id: int, session: Any) -> float: diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index c15d3ff0..3cdc893c 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -484,8 +484,6 @@ async def complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_g else: cluster_id = server_id - await conn.close() - logger.info(f"[RENEW] Запуск продления ключа для пользователя {tg_id} на {plan} мес. в кластере {cluster_id}.") async def renew_key_on_cluster(): @@ -500,5 +498,7 @@ async def complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_g await update_key_expiry(client_id, new_expiry_time, conn) await update_balance(tg_id, -cost, conn) logger.info(f"[RENEW] Ключ {client_id} успешно продлён на {plan} мес. для пользователя {tg_id}.") + + await conn.close() await renew_key_on_cluster()