fix: use correct logging handler for scheduler (#1178)

main
Florian Perucki 5 years ago committed by Selwin Ong
parent baa0cc268a
commit 37a6304a4f

@ -10,8 +10,8 @@ from rq.defaults import (DEFAULT_LOGGING_FORMAT,
def setup_loghandlers(level=None, date_format=DEFAULT_LOGGING_DATE_FORMAT, def setup_loghandlers(level=None, date_format=DEFAULT_LOGGING_DATE_FORMAT,
log_format=DEFAULT_LOGGING_FORMAT): log_format=DEFAULT_LOGGING_FORMAT, name='rq.worker'):
logger = logging.getLogger('rq.worker') logger = logging.getLogger(name)
if not _has_effective_handler(logger): if not _has_effective_handler(logger):
formatter = logging.Formatter(fmt=log_format, datefmt=date_format) formatter = logging.Formatter(fmt=log_format, datefmt=date_format)

@ -11,13 +11,18 @@ from .job import Job
from .queue import Queue from .queue import Queue
from .registry import ScheduledJobRegistry from .registry import ScheduledJobRegistry
from .utils import current_timestamp, enum from .utils import current_timestamp, enum
from .logutils import setup_loghandlers
SCHEDULER_KEY_TEMPLATE = 'rq:scheduler:%s' SCHEDULER_KEY_TEMPLATE = 'rq:scheduler:%s'
SCHEDULER_LOCKING_KEY_TEMPLATE = 'rq:scheduler-lock:%s' SCHEDULER_LOCKING_KEY_TEMPLATE = 'rq:scheduler-lock:%s'
format = "%(asctime)s: %(message)s" setup_loghandlers(
logging.basicConfig(format=format, level=logging.INFO, datefmt="%H:%M:%S") level=logging.INFO,
name="rq.scheduler",
log_format="%(asctime)s: %(message)s",
date_format="%H:%M:%S"
)
class RQScheduler(object): class RQScheduler(object):

Loading…
Cancel
Save