diff options
author | Pierre Mdawar <p.mdawar@gmail.com> | 2020-04-16 15:54:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-16 19:54:56 +0700 |
commit | 0dd9ff0ec9a91e5a81cd5a30651287cad32f8ab0 (patch) | |
tree | a9e9c495901b26cb147456d73b57788bea98c2ad | |
parent | e1cbc3736c55d7a72be121a170d1b8c811619dc2 (diff) | |
download | rq-0dd9ff0ec9a91e5a81cd5a30651287cad32f8ab0.tar.gz |
Accept lowercase logging level names and accept tuples when setting exception handlers (#1233)
* Accept lowercase logging level names
* Accept both lists and tuples when setting Worker exception_handlers
-rw-r--r-- | rq/logutils.py | 4 | ||||
-rw-r--r-- | rq/worker.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rq/logutils.py b/rq/logutils.py index 2d849c1..324553b 100644 --- a/rq/logutils.py +++ b/rq/logutils.py @@ -20,7 +20,9 @@ def setup_loghandlers(level=None, date_format=DEFAULT_LOGGING_DATE_FORMAT, logger.addHandler(handler) if level is not None: - logger.setLevel(level) + # The level may be a numeric value (e.g. when using the logging module constants) + # Or a string representation of the logging level + logger.setLevel(level if isinstance(level, int) else level.upper()) def _has_effective_handler(logger): diff --git a/rq/worker.py b/rq/worker.py index 50d1733..7e090f5 100644 --- a/rq/worker.py +++ b/rq/worker.py @@ -210,7 +210,7 @@ class Worker(object): self.disable_default_exception_handler = disable_default_exception_handler - if isinstance(exception_handlers, list): + if isinstance(exception_handlers, (list, tuple)): for handler in exception_handlers: self.push_exc_handler(handler) elif exception_handlers is not None: |