fix:using scheduler logger

Author: cunla

scheduler/decorators.py

@@ -8,8 +8,7 @@ def job(*args, **kwargs):
     The same as rq package's job decorator, but it automatically works out
     the ``connection`` argument from SCHEDULER_QUEUES.
 
-    And also, it allows simplified ``@job`` syntax to put job into
-    default queue.
+    And also, it allows simplified ``@job`` syntax to put a job into the default queue.
 
     """
     if len(args) == 0:

scheduler/models/scheduled_task.py

@@ -20,8 +20,9 @@
 from scheduler import settings
 from scheduler import tools
 from scheduler.models.args import TaskArg, TaskKwarg
-from scheduler.queues import get_queue, logger
+from scheduler.queues import get_queue
 from scheduler.rq_classes import DjangoQueue
+from scheduler.settings import logger
 
 SCHEDULER_INTERVAL = settings.SCHEDULER_CONFIG['SCHEDULER_INTERVAL']
 

scheduler/settings.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
-logger = logging.getLogger("scheduler")
+logger = logging.getLogger(__package__)
 
 QUEUES = dict()
 SCHEDULER_CONFIG = dict()

scheduler/tools.py

@@ -20,8 +20,7 @@ def callable_func(callable_str: str):
 
 
 def get_next_cron_time(cron_string) -> timezone.datetime:
-    """Calculate the next scheduled time by creating a crontab object
-    with a cron string"""
+    """Calculate the next scheduled time by creating a crontab object with a cron string"""
     now = timezone.now()
     itr = croniter.croniter(cron_string, now)
     next_itr = itr.get_next(timezone.datetime)

scheduler/views.py

@@ -1,4 +1,5 @@
 from html import escape
+from math import ceil
 from typing import Tuple, Optional
 
 import redis
@@ -11,13 +12,12 @@
 from django.shortcuts import render
 from django.urls import reverse, resolve
 from django.views.decorators.cache import never_cache
-from math import ceil
 from redis.exceptions import ResponseError
 
-from .queues import get_all_workers, get_connection, logger, QueueNotFoundError
+from .queues import get_all_workers, get_connection, QueueNotFoundError
 from .queues import get_queue as get_queue_base
 from .rq_classes import JobExecution, DjangoWorker, DjangoQueue, InvalidJobOperation
-from .settings import SCHEDULER_CONFIG
+from .settings import SCHEDULER_CONFIG, logger
 
 
 def get_queue(queue_name: str) -> DjangoQueue: