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.
This commit is contained in:
parent
e5714519bb
commit
5058fb1c18
3 changed files with 6 additions and 20 deletions
|
|
@ -1,3 +1,4 @@
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import shutil
|
import shutil
|
||||||
|
|
@ -8,17 +9,16 @@ from typing import Any, Type
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from celery.app import shared_task
|
from celery.app import shared_task
|
||||||
from celery.utils.log import get_task_logger
|
|
||||||
from constance import config
|
from constance import config
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
|
|
||||||
from core.models import Product, Promotion
|
from core.models import Product, Promotion
|
||||||
from core.utils.caching import set_default_cache
|
from core.utils.caching import set_default_cache
|
||||||
from core.utils.vendors import get_vendors_integrations
|
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
|
from evibes.settings import MEDIA_ROOT
|
||||||
|
|
||||||
logger = get_task_logger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@shared_task(queue="stock_updater")
|
@shared_task(queue="stock_updater")
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
|
import logging
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from celery.app import shared_task
|
from celery.app import shared_task
|
||||||
from celery.utils.log import get_task_logger
|
|
||||||
from constance import config
|
from constance import config
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.mail import EmailMessage
|
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.models import Order, OrderProduct, PromoCode
|
||||||
from core.utils import get_dynamic_email_connection
|
from core.utils import get_dynamic_email_connection
|
||||||
|
|
||||||
logger = get_task_logger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@shared_task(queue="default")
|
@shared_task(queue="default")
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,11 @@
|
||||||
import logging
|
import logging
|
||||||
from contextlib import suppress
|
|
||||||
from typing import Type
|
from typing import Type
|
||||||
|
|
||||||
from celery import current_task
|
|
||||||
from celery.utils.log import get_task_logger
|
|
||||||
|
|
||||||
from core.models import Vendor
|
from core.models import Vendor
|
||||||
from core.vendors import AbstractVendor
|
from core.vendors import AbstractVendor
|
||||||
from evibes.utils.misc import create_object
|
from evibes.utils.misc import create_object
|
||||||
|
|
||||||
sync_logger = logging.getLogger(__name__)
|
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
|
|
||||||
|
|
||||||
|
|
||||||
def get_vendors_integrations(name: str | None = None) -> list[Type[AbstractVendor]]:
|
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:
|
if name:
|
||||||
vendors = vendors.filter(name=name)
|
vendors = vendors.filter(name=name)
|
||||||
|
|
||||||
logger = async_logger if _in_celery_task() else sync_logger
|
|
||||||
|
|
||||||
for vendor in vendors:
|
for vendor in vendors:
|
||||||
try:
|
try:
|
||||||
module_name, class_name = vendor.integration_path.rsplit(".", 1)
|
module_name, class_name = vendor.integration_path.rsplit(".", 1)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue