From 2da4ccd48d730b2aac40850d6f2add891ebaffab Mon Sep 17 00:00:00 2001 From: Yaniv Greenberg Date: Sun, 14 May 2017 11:12:35 +0300 Subject: [PATCH] Moved move_to_failed_queue to separate file. --- rq/handlers.py | 12 ++++++++++++ rq/worker.py | 12 ++---------- 2 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 rq/handlers.py diff --git a/rq/handlers.py b/rq/handlers.py new file mode 100644 index 0000000..33ac03d --- /dev/null +++ b/rq/handlers.py @@ -0,0 +1,12 @@ +import traceback + +from .connections import get_current_connection +from .queue import get_failed_queue +from .worker import Worker + + +def move_to_failed_queue(job, *exc_info): + """Default exception handler: move the job to the failed queue.""" + exc_string = Worker._get_safe_exception_string(traceback.format_exception(*exc_info)) + failed_queue = get_failed_queue(get_current_connection(), job.__class__) + failed_queue.quarantine(job, exc_info=exc_string) diff --git a/rq/worker.py b/rq/worker.py index c33e5fa..1c3e96a 100644 --- a/rq/worker.py +++ b/rq/worker.py @@ -16,15 +16,14 @@ from datetime import timedelta from redis import WatchError -from rq.compat import as_text, string_types, text_type - -from .compat import PY2 +from .compat import PY2, as_text, string_types, text_type from .connections import get_current_connection, push_connection, pop_connection from .defaults import DEFAULT_RESULT_TTL, DEFAULT_WORKER_TTL from .exceptions import DequeueTimeout, ShutDownImminentException from .job import Job, JobStatus from .logutils import setup_loghandlers from .queue import Queue, get_failed_queue +from .handlers import move_to_failed_queue from .registry import FinishedJobRegistry, StartedJobRegistry, clean_registries from .suspension import is_suspended from .timeouts import UnixSignalDeathPenalty @@ -85,13 +84,6 @@ WorkerStatus = enum( ) -def move_to_failed_queue(job, *exc_info): - """Default exception handler: move the job to the failed queue.""" - exc_string = Worker._get_safe_exception_string(traceback.format_exception(*exc_info)) - failed_queue = get_failed_queue(get_current_connection(), job.__class__) - failed_queue.quarantine(job, exc_info=exc_string) - - class Worker(object): redis_worker_namespace_prefix = 'rq:worker:' redis_workers_keys = 'rq:workers'