From 048be00510f5d10804fc3a0dd29de30649d25628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Praszmo?= Date: Tue, 20 Jun 2023 09:50:29 +0200 Subject: [PATCH] Revert cancel refactor --- karton/dashboard/app.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/karton/dashboard/app.py b/karton/dashboard/app.py index 575c504..64d9681 100644 --- a/karton/dashboard/app.py +++ b/karton/dashboard/app.py @@ -50,6 +50,11 @@ class KartonDashboard(KartonBase): ) +def cancel_tasks(tasks: List[Task]) -> None: + for task in tasks: + karton.backend.set_task_status(task=task, status=TaskState.FINISHED) + + class TaskView: """ All problems in computer science can be solved by another @@ -276,7 +281,7 @@ def cancel_crashed_queue_tasks(queue_name): if not queue: return jsonify({"error": "Queue doesn't exist"}), 404 - karton.backend.delete_tasks(queue.crashed_tasks) + cancel_tasks(queue.crashed_tasks) return redirect(request.referrer) @@ -287,7 +292,7 @@ def cancel_pending_queue_tasks(queue_name): if not queue: return jsonify({"error": "Queue doesn't exist"}), 404 - karton.backend.delete_tasks(queue.pending_tasks) + cancel_tasks(queue.pending_tasks) return redirect(request.referrer) @@ -307,7 +312,7 @@ def cancel_task(task_id): if not task: return jsonify({"error": "Task doesn't exist"}), 404 - karton.backend.delete_tasks([task]) + cancel_tasks([task]) return redirect(request.referrer)