starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-19 08:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix cancel job for flows in some edge cases

Browse Source
This commit is contained in:
Ruben Fiszel
2023-08-22 21:35:03 +02:00
parent d7dc8a745c
commit 58bb19a447
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-queue/src/jobs.rs
+5 -1
View File
@@ -140,7 +140,11 @@ pub async fn cancel_job<'c: 'async_recursion>(
return Ok((tx, None));
}
let job_running = job_running.unwrap();
if job_running.running && !force_cancel {
if job_running.running
&& job_running.job_kind != JobKind::Flow
&& job_running.job_kind != JobKind::FlowPreview
&& !force_cancel
{
sqlx::query!(
"UPDATE queue SET canceled = true, canceled_by = $1, canceled_reason = $2, scheduled_for = now(), suspend = 0 WHERE id = $3 \
AND workspace_id = $4 ",
frontend/src/lib/components/FlowStatusViewer.svelte
+1 -1
View File
@@ -492,7 +492,7 @@
target="_blank"
href="/run/{node.job_id ?? ''}?workspace={job?.workspace_id}"
>
{truncateRev(node.job_id ?? '', 1) ?? ''}
{truncateRev(node.job_id ?? '', 10) ?? ''}
</a>
</div>
</div>