summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rq/logutils.py4
-rw-r--r--rq/scheduler.py9
2 files changed, 9 insertions, 4 deletions
diff --git a/rq/logutils.py b/rq/logutils.py
index 2ae417a..2d849c1 100644
--- a/rq/logutils.py
+++ b/rq/logutils.py
@@ -10,8 +10,8 @@ from rq.defaults import (DEFAULT_LOGGING_FORMAT,
def setup_loghandlers(level=None, date_format=DEFAULT_LOGGING_DATE_FORMAT,
- log_format=DEFAULT_LOGGING_FORMAT):
- logger = logging.getLogger('rq.worker')
+ log_format=DEFAULT_LOGGING_FORMAT, name='rq.worker'):
+ logger = logging.getLogger(name)
if not _has_effective_handler(logger):
formatter = logging.Formatter(fmt=log_format, datefmt=date_format)
diff --git a/rq/scheduler.py b/rq/scheduler.py
index d4ebec5..f269ea9 100644
--- a/rq/scheduler.py
+++ b/rq/scheduler.py
@@ -11,13 +11,18 @@ from .job import Job
from .queue import Queue
from .registry import ScheduledJobRegistry
from .utils import current_timestamp, enum
+from .logutils import setup_loghandlers
SCHEDULER_KEY_TEMPLATE = 'rq:scheduler:%s'
SCHEDULER_LOCKING_KEY_TEMPLATE = 'rq:scheduler-lock:%s'
-format = "%(asctime)s: %(message)s"
-logging.basicConfig(format=format, level=logging.INFO, datefmt="%H:%M:%S")
+setup_loghandlers(
+ level=logging.INFO,
+ name="rq.scheduler",
+ log_format="%(asctime)s: %(message)s",
+ date_format="%H:%M:%S"
+)
class RQScheduler(object):