From 46e48330f538e3be6d1f649236686d8aff4bbe10 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Fri, 14 Jun 2019 11:28:20 -0400 Subject: [PATCH] Cancel monitor before deleting lock --- worker/tasks.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worker/tasks.py b/worker/tasks.py index 473e399a..bc299f23 100644 --- a/worker/tasks.py +++ b/worker/tasks.py @@ -105,14 +105,16 @@ def process_task(taskId): e, traceback.format_exc())) if settings.TESTING: raise e finally: + if cancel_monitor is not None: + cancel_monitor() + try: redis_client.delete(lock_id) except redis.exceptions.RedisError: # Ignore errors, the lock will expire at some point pass - if cancel_monitor is not None: - cancel_monitor() + def get_pending_tasks(): # All tasks that have a processing node assigned