From 024f80aee4c10918e011fd74f9762110bbcb1f8e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 26 Feb 2024 15:03:35 +0100
Subject: [PATCH] fix: handle better flow hanging monitor

---
 backend/windmill-worker/src/worker_flow.rs | 38 ++++++++++------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 0d9ffde0d2..a9ef9fbb06 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -2060,28 +2060,26 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
 
     potentially_crash_for_testing();
 
-    if !flow_job.is_flow_step
-        && status.step == 0
-    {
 
-        if flow_job.schedule_path.is_some()
-            && flow_job.script_path.is_some() {
-            tx = handle_maybe_scheduled_job(
-                tx,
-                db,
-                flow_job.schedule_path.as_ref().unwrap(),
-                flow_job.script_path.as_ref().unwrap(),
-                &flow_job.workspace_id,
-            )
-            .await?;
-        }
-        sqlx::query!(
-            "UPDATE queue
-            SET last_ping = null
-            WHERE id = $1",
-            flow_job.id
-        ).execute(&mut tx).await?;
+    if status.step == 0 && !flow_job.is_flow_step && flow_job.schedule_path.is_some()
+        && flow_job.script_path.is_some() {
+        tx = handle_maybe_scheduled_job(
+            tx,
+            db,
+            flow_job.schedule_path.as_ref().unwrap(),
+            flow_job.script_path.as_ref().unwrap(),
+            &flow_job.workspace_id,
+        )
+        .await?;
     }
+    
+
+    sqlx::query!(
+        "UPDATE queue
+        SET last_ping = null
+        WHERE id = $1",
+        flow_job.id
+    ).execute(&mut tx).await?;