From 38f4e7f69d2c0c5a042d64d12580342aaa264a93 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 27 Aug 2023 15:09:54 +0200
Subject: [PATCH] fix cancel jobs

---
 backend/windmill-api/src/tracing_init.rs      | 19 ++++++++++++++-----
 backend/windmill-queue/src/jobs.rs            |  2 +-
 .../src/routes/(root)/(logged)/+page.svelte   |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/backend/windmill-api/src/tracing_init.rs b/backend/windmill-api/src/tracing_init.rs
index b30fa84499..1f93b941cb 100644
--- a/backend/windmill-api/src/tracing_init.rs
+++ b/backend/windmill-api/src/tracing_init.rs
@@ -10,6 +10,13 @@ use ::tracing::{field, Span};
 use hyper::Response;
 use tower_http::trace::{MakeSpan, OnFailure, OnResponse};
 
+lazy_static::lazy_static! {
+    static ref LOG_REQUESTS: bool = std::env::var("LOG_REQUESTS")
+    .ok()
+    .and_then(|x| x.parse::<bool>().ok())
+    .unwrap_or(true);
+}
+
 #[derive(Clone)]
 pub struct MyOnResponse {}
 
@@ -20,11 +27,13 @@ impl<B> OnResponse<B> for MyOnResponse {
         latency: std::time::Duration,
         _span: &tracing::Span,
     ) {
-        tracing::info!(
-            latency = latency.as_millis(),
-            status = response.status().as_u16(),
-            "response"
-        )
+        if *LOG_REQUESTS {
+            tracing::info!(
+                latency = latency.as_millis(),
+                status = response.status().as_u16(),
+                "response"
+            )
+        }
     }
 }
 
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index 1a766e9f28..336fb2c119 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -141,7 +141,7 @@ pub async fn cancel_job<'c: 'async_recursion>(
     }
     let job_running = job_running.unwrap();
 
-    if ((!job_running.running && job_running.root_job.is_none())
+    if ((job_running.running || job_running.root_job.is_some())
         || (job_running.job_kind == JobKind::Flow || job_running.job_kind == JobKind::FlowPreview))
         && !force_cancel
     {
diff --git a/frontend/src/routes/(root)/(logged)/+page.svelte b/frontend/src/routes/(root)/(logged)/+page.svelte
index ff6640fa1d..9bb4f8b7b3 100644
--- a/frontend/src/routes/(root)/(logged)/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/+page.svelte
@@ -194,7 +194,7 @@
 		<PageHeader title="Home">
 			<div class="flex flex-row gap-4 flex-wrap justify-end items-center">
 				{#if !$userStore?.operator}
-					<span class="text-sm text-secondary">Create a new:</span>
+					<span class="text-sm text-secondary">Create a</span>
 					<CreateActionsScript />
 					{#if HOME_SHOW_CREATE_FLOW}<CreateActionsFlow />{/if}
 					{#if HOME_SHOW_CREATE_APP}<CreateActionsApp />{/if}