diff --git a/rq/logutils.py b/rq/logutils.py index ff87337..2a23ae2 100644 --- a/rq/logutils.py +++ b/rq/logutils.py @@ -11,32 +11,15 @@ try: except ImportError: from rq.compat.dictconfig import dictConfig # noqa +from rq.utils import ColorizingStreamHandler -def setup_loghandlers(level=None): - if not logging._handlers: - dictConfig({ - 'version': 1, - 'disable_existing_loggers': False, - 'formatters': { - 'console': { - 'format': '%(asctime)s %(message)s', - 'datefmt': '%H:%M:%S', - }, - }, - - 'handlers': { - 'console': { - 'level': 'DEBUG', - # 'class': 'logging.StreamHandler', - 'class': 'rq.utils.ColorizingStreamHandler', - 'formatter': 'console', - 'exclude': ['%(asctime)s'], - }, - }, - - 'root': { - 'handlers': ['console'], - 'level': level or 'INFO', - } - }) +def setup_loghandlers(level='INFO'): + logger = logging.getLogger('rq.worker') + if not logger.handlers: + logger.setLevel(level) + formatter = logging.Formatter(fmt='%(asctime)s %(message)s', + datefmt='%H:%M:%S') + handler = ColorizingStreamHandler() + handler.setFormatter(formatter) + logger.addHandler(handler) diff --git a/rq/scripts/rqworker.py b/rq/scripts/rqworker.py index 5a2b696..0f7d1e1 100644 --- a/rq/scripts/rqworker.py +++ b/rq/scripts/rqworker.py @@ -17,8 +17,6 @@ from rq.scripts import (add_standard_arguments, read_config_file, setup_default_arguments, setup_redis) from rq.utils import import_attribute -logger = logging.getLogger(__name__) - def parse_args(): parser = argparse.ArgumentParser(description='Starts an RQ worker.')