tasktiger 0.19.2__tar.gz → 0.19.4__tar.gz

{tasktiger-0.19.2/tasktiger.egg-info → tasktiger-0.19.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tasktiger
-Version: 0.19.2
+Version: 0.19.4
 Summary: Python task queue
 Home-page: http://github.com/closeio/tasktiger
 License: MIT

{tasktiger-0.19.2 → tasktiger-0.19.4}/setup.py

@@ -9,7 +9,7 @@ tests_require = install_requires + ["freezefrog", "pytest", "psutil"]
 
 setup(
     name="tasktiger",
-    version="0.19.2",
+    version="0.19.4",
     url="http://github.com/closeio/tasktiger",
     license="MIT",
     description="Python task queue",

{tasktiger-0.19.2 → tasktiger-0.19.4}/tasktiger/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from .exceptions import (
     JobTimeoutException,
     QueueFullException,

{tasktiger-0.19.2 → tasktiger-0.19.4}/tasktiger/exceptions.py

@@ -31,20 +31,26 @@ class StopRetry(Exception):
 
 class RetryException(BaseException):
     """
-    Alternative to retry_on for retrying a task. If raised within a task, the
-    task will be retried as long as the retry method permits. The default retry
-    method (specified in the task or in DEFAULT_RETRY_METHOD) may be overridden
-    using the method argument. If original_traceback is True and RetryException
-    is raised from within an except block, the original traceback will be
-    logged. If log_error is set to False and the task fails permanently, a
-    warning will be logged instead of an error, and the task will be removed
-    from Redis when it completes.
+    Alternative to the `retry_on` parameter for retrying a task.
+
+    If this exception is raised within a task, the task will be retried as long
+    as the retry method permits.
+
+    The default retry method (specified in the task or in DEFAULT_RETRY_METHOD)
+    may be overridden using the method argument.
+
+    If original_traceback is True and RetryException is raised from within an
+    `except` block, the original traceback will be logged.
+
+    If `log_error` is set to False and the task fails permanently, a warning
+    will be logged instead of an error, and the task will be removed from Redis
+    when it completes.
     """
 
     def __init__(
         self,
         method: Any = None,
-        original_traceback: Any = False,
+        original_traceback: bool = False,
         log_error: bool = True,
     ):
         self.method = method

{tasktiger-0.19.2 → tasktiger-0.19.4}/tasktiger/executor.py

@@ -417,6 +417,8 @@ class SyncExecutor(Executor):
         locks: Collection[Lock],
         queue_lock: Optional[Semaphore],
     ) -> bool:
+        assert tasks
+
         # Run heartbeat thread.
         all_task_ids = {task.id for task in tasks}
         stop_event = threading.Event()
@@ -433,11 +435,23 @@ class SyncExecutor(Executor):
         )
         heartbeat_thread.start()
 
-        # Run the tasks.
-        result = self.execute_tasks(tasks, log)
+        serialized_task_func = tasks[0].serialized_func
+        for task in tasks:
+            log.info(
+                "processing",
+                func=serialized_task_func,
+                task_id=task.id,
+                params={"args": task.args, "kwargs": task.kwargs},
+            )
 
-        # Stop the heartbeat thread.
-        stop_event.set()
-        heartbeat_thread.join()
+        # Run the tasks.
+        try:
+            result = self.execute_tasks(tasks, log)
+        # Always stop the heartbeat thread -- even in case of an unhandled
+        # exception after running the task code, or when an unhandled
+        # BaseException is raised from within the task.
+        finally:
+            stop_event.set()
+            heartbeat_thread.join()
 
         return result

{tasktiger-0.19.2 → tasktiger-0.19.4}/tasktiger/flask_script.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import argparse
 from typing import TYPE_CHECKING, Any, List
 

{tasktiger-0.19.2 → tasktiger-0.19.4}/tasktiger/rollbar.py

@@ -1,6 +1,3 @@
-# Make "import rollbar" import rollbar, and not the current module.
-from __future__ import absolute_import
-
 import json
 from typing import Any
 

{tasktiger-0.19.2 → tasktiger-0.19.4}/tasktiger/tasktiger.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import datetime
 import importlib
 import logging

{tasktiger-0.19.2 → tasktiger-0.19.4}/tasktiger/timeouts.py

@@ -1,11 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import signal
 from types import TracebackType
 from typing import Any, Literal, Optional, Type

{tasktiger-0.19.2 → tasktiger-0.19.4/tasktiger.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tasktiger
-Version: 0.19.2
+Version: 0.19.4
 Summary: Python task queue
 Home-page: http://github.com/closeio/tasktiger
 License: MIT

{tasktiger-0.19.2 → tasktiger-0.19.4}/tests/tasks.py

@@ -35,6 +35,10 @@ def exception_task():
     raise Exception("this failed")
 
 
+def system_exit_task():
+    raise SystemExit()
+
+
 @tiger.task(queue="other")
 def task_on_other_queue():
     pass

{tasktiger-0.19.2 → tasktiger-0.19.4}/tests/test_lazy_init.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import logging
 import tempfile
 

{tasktiger-0.19.2 → tasktiger-0.19.4}/tests/test_logging.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import pytest
 import structlog
 

{tasktiger-0.19.2 → tasktiger-0.19.4}/tests/test_workers.py

@@ -19,6 +19,7 @@ from .tasks import (
     long_task_ok,
     simple_task,
     sleep_task,
+    system_exit_task,
     wait_for_long_task,
 )
 from .test_base import BaseTestCase
@@ -238,3 +239,28 @@ class TestSyncExecutorWorker:
         assert task_lock_2 > DELAY
 
         worker.kill()
+
+    def test_stop_heartbeat_thread_on_unhandled_exception(
+        self, tiger, ensure_queues
+    ):
+        task = Task(tiger, system_exit_task)
+        task.delay()
+
+        # Start a worker and wait until it starts processing.
+        worker = Process(
+            target=external_worker,
+            kwargs={
+                "worker_kwargs": {
+                    "executor_class": SyncExecutor,
+                },
+            },
+        )
+        worker.start()
+
+        # Ensure process exits and does not hang here.
+        worker.join()
+
+        # Since SystemExit derives from BaseException and is therefore not
+        # handled by the executor, the task is still active until it times out
+        # and gets requeued by another worker.
+        ensure_queues(active={"default": 1})