From 5058fb1c18d3e74ea3893ab4c0f2c2b64aeba235 Mon Sep 17 00:00:00 2001 From: Egor fureunoir Gorbunov Date: Tue, 4 Nov 2025 15:09:38 +0300 Subject: [PATCH] Features: 1) Replace `celery.utils.log.get_task_logger` with standard `logging.getLogger` for uniform logger usage. Fixes: 1) Remove unused imports in `vendors.py`, `tasks.py`, and `emailing.py`. Extra: 1) Minor cleanup of redundant functions and variables in `vendors.py`; 2) Reorganize imports for clarity and consistency. --- core/tasks.py | 6 +++--- core/utils/emailing.py | 4 ++-- core/utils/vendors.py | 16 +--------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/core/tasks.py b/core/tasks.py index 9f417649..09bbd904 100644 --- a/core/tasks.py +++ b/core/tasks.py @@ -1,3 +1,4 @@ +import logging import os import random import shutil @@ -8,17 +9,16 @@ from typing import Any, Type import requests from celery.app import shared_task -from celery.utils.log import get_task_logger from constance import config from django.core.cache import cache from core.models import Product, Promotion from core.utils.caching import set_default_cache from core.utils.vendors import get_vendors_integrations -from core.vendors import VendorInactiveError, delete_stale, AbstractVendor +from core.vendors import AbstractVendor, VendorInactiveError, delete_stale from evibes.settings import MEDIA_ROOT -logger = get_task_logger(__name__) +logger = logging.getLogger(__name__) @shared_task(queue="stock_updater") diff --git a/core/utils/emailing.py b/core/utils/emailing.py index 38109f87..64192495 100644 --- a/core/utils/emailing.py +++ b/core/utils/emailing.py @@ -1,7 +1,7 @@ +import logging from datetime import datetime from celery.app import shared_task -from celery.utils.log import get_task_logger from constance import config from django.conf import settings from django.core.mail import EmailMessage @@ -12,7 +12,7 @@ from django.utils.translation import gettext_lazy as _ from core.models import Order, OrderProduct, PromoCode from core.utils import get_dynamic_email_connection -logger = get_task_logger(__name__) +logger = logging.getLogger(__name__) @shared_task(queue="default") diff --git a/core/utils/vendors.py b/core/utils/vendors.py index 5347ec9d..61774fc5 100644 --- a/core/utils/vendors.py +++ b/core/utils/vendors.py @@ -1,23 +1,11 @@ import logging -from contextlib import suppress from typing import Type -from celery import current_task -from celery.utils.log import get_task_logger - from core.models import Vendor from core.vendors import AbstractVendor from evibes.utils.misc import create_object -sync_logger = logging.getLogger(__name__) -async_logger = get_task_logger(__name__) - - -def _in_celery_task() -> bool: - task = current_task - with suppress(Exception): - return bool(task and getattr(task, "request", None) and getattr(task.request, "id", None)) - return False +logger = logging.getLogger(__name__) def get_vendors_integrations(name: str | None = None) -> list[Type[AbstractVendor]]: @@ -27,8 +15,6 @@ def get_vendors_integrations(name: str | None = None) -> list[Type[AbstractVendo if name: vendors = vendors.filter(name=name) - logger = async_logger if _in_celery_task() else sync_logger - for vendor in vendors: try: module_name, class_name = vendor.integration_path.rsplit(".", 1)