From eb6d0084ab30fef425c9ff3a7ea712308a3ceb9a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 12 Oct 2022 15:56:15 +0200
Subject: [PATCH] fix suspend + sleep with same worker

---
 backend/src/jobs.rs        | 3 +--
 backend/src/worker_flow.rs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/jobs.rs b/backend/src/jobs.rs
index 95bb7ad8e6..2dbc7d6239 100644
--- a/backend/src/jobs.rs
+++ b/backend/src/jobs.rs
@@ -1399,9 +1399,8 @@ pub async fn push<'c>(
         }
     };
 
-    let mut is_running = same_worker;
+    let is_running = same_worker;
     if let Some(flow) = raw_flow.as_ref() {
-        is_running = false;
         same_worker = same_worker || flow.same_worker;
         if flow.modules.len() == 0 {
             Err(Error::BadRequest(format!(
diff --git a/backend/src/worker_flow.rs b/backend/src/worker_flow.rs
index b71d169a61..65d42064ab 100644
--- a/backend/src/worker_flow.rs
+++ b/backend/src/worker_flow.rs
@@ -925,7 +925,7 @@ async fn push_next_flow_job(
     };
 
     let continue_on_same_worker =
-        flow.same_worker && !matches!(job_payload, JobPayload::RawFlow { .. });
+        flow.same_worker && module.suspend.is_none() && module.sleep.is_none();
 
     /* Finally, push the job into the queue */
     let tx = db.begin().await?;