From 596842e692ddaefb54d17ccd097fad1db6a000b0 Mon Sep 17 00:00:00 2001
From: Noortheen Raja <jnoortheen@gmail.com>
Date: Tue, 5 Jul 2022 21:53:27 +0530
Subject: [PATCH 1/2] chore: pip install support

having build-system config helps installing  this without setup.py built
---
 pyproject.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 85191d8..8a6221b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -79,3 +79,7 @@ sentry = ["django-q-sentry"]
 [tool.isort]
 profile = "black"
 multi_line_output = 3
+
+[build-system]
+requires = ["poetry-core>=1.0.8"]
+build-backend = "poetry.core.masonry.api"

From 64d73a77b7884a87fd9bce230f0971f7cf85414f Mon Sep 17 00:00:00 2001
From: Noortheen Raja <jnoortheen@gmail.com>
Date: Fri, 8 Jul 2022 11:24:03 +0530
Subject: [PATCH 2/2] feat: option to fail-on-timeout

fixes #251
---
 django_q/cluster.py | 32 ++++++++++++++++++++++++++++++++
 django_q/conf.py    |  3 +++
 docs/configure.rst  |  6 ++++++
 3 files changed, 41 insertions(+)

diff --git a/django_q/cluster.py b/django_q/cluster.py
index df4afb4..a0c5c54 100644
--- a/django_q/cluster.py
+++ b/django_q/cluster.py
@@ -400,6 +400,29 @@ def monitor(result_queue: Queue, broker: Broker = None):
     logger.info(_(f"{name} stopped monitoring results"))
 
 
+def _check_task_timed_out(key, task: dict):
+    result = None
+    broker = get_broker()
+    cache = broker.cache
+    working_set = cache.get(key) or set()
+    if task["id"] in working_set:
+        # the previous worker has timedout and wasn't given chance to clear
+        raise Exception(f"Task Timed-out: {task}.")
+    else:
+        working_set.add(task['id'])
+        cache.set(key, working_set, timeout=Conf.RETRY * 3)
+    return result
+
+
+def _clear_task_timeout_cache(key, task):
+    broker = get_broker()
+    cache = broker.cache
+    working_set = cache.get(key) or set()
+    if task["id"] in working_set:
+        working_set.remove(task['id'])
+        cache.set(key, working_set, timeout=Conf.RETRY * 3)
+
+
 def worker(
     task_queue: Queue, result_queue: Queue, timer: Value, timeout: int = Conf.TIMEOUT
 ):
@@ -415,6 +438,8 @@ def worker(
     task_count = 0
     if timeout is None:
         timeout = -1
+
+    working_tasks_key = "DJANGO-Q-WORKING-TASKS"
     # Start reading the task queue
     for task in iter(task_queue.get, "STOP"):
         result = None
@@ -434,7 +459,11 @@ def worker(
         pre_execute.send(sender="django_q", func=f, task=task)
         # execute the payload
         timer.value = timer_value  # Busy
+
+
         try:
+            if Conf.FAIL_ON_TIMEOUT:
+                _check_task_timed_out(working_tasks_key, task)
             res = f(*task["args"], **task["kwargs"])
             result = (res, True)
         except Exception as e:
@@ -443,6 +472,9 @@ def worker(
                 error_reporter.report()
             if task.get("sync", False):
                 raise
+        if Conf.FAIL_ON_TIMEOUT:
+            _clear_task_timeout_cache(working_tasks_key, task)
+
         with timer.get_lock():
             # Process result
             task["result"] = result[0]
diff --git a/django_q/conf.py b/django_q/conf.py
index 13a1098..abda8ab 100644
--- a/django_q/conf.py
+++ b/django_q/conf.py
@@ -123,6 +123,9 @@ class Conf:
     # Number of seconds to wait for a worker to finish.
     TIMEOUT = conf.get("timeout", None)
 
+    # Whether to fail the task when it times-out.
+    FAIL_ON_TIMEOUT = conf.get("fail_on_timeout", False)
+
     # Whether to acknowledge unsuccessful tasks.
     # This causes failed tasks to be considered delivered, thereby removing them from
     # the task queue. Defaults to False.
diff --git a/docs/configure.rst b/docs/configure.rst
index 01241f3..e799efd 100644
--- a/docs/configure.rst
+++ b/docs/configure.rst
@@ -70,6 +70,12 @@ Set this to something that makes sense for your project. Can be overridden for i
 
 See :ref:`retry` for details how to set values for timeout and retry.
 
+fail_on_timeout
+~~~~~~~~~~~~~~~
+
+When set to ``True``, timeouts will result in error. Defaults to ``False``.
+
+
 .. _ack_failures:
 
 ack_failures