mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-20 00:02:19 +00:00
fix(backend): return flow result if flow fails or stops before early return (#3704)
* fix: return error if flow fails before early return * fix: also handle early stop * fix: improve code
This commit is contained in:
@@ -2528,7 +2528,7 @@ async fn run_wait_result(
|
||||
w_id: String,
|
||||
node_id_for_empty_return: Option<String>,
|
||||
) -> error::Result<Response> {
|
||||
let mut result;
|
||||
let mut result = None;
|
||||
let timeout = SERVER_CONFIG.read().await.timeout_wait_result.clone();
|
||||
let timeout_ms = if timeout <= 0 {
|
||||
2000
|
||||
@@ -2552,7 +2552,9 @@ async fn run_wait_result(
|
||||
)
|
||||
.await
|
||||
.ok();
|
||||
} else {
|
||||
}
|
||||
|
||||
if result.is_none() {
|
||||
let row = sqlx::query(
|
||||
"SELECT result, language, flow_status FROM completed_job WHERE id = $1 AND workspace_id = $2",
|
||||
)
|
||||
@@ -2570,8 +2572,6 @@ async fn run_wait_result(
|
||||
FormattedResult::RawValue(rv) => rv,
|
||||
FormattedResult::Vec(v) => Some(to_raw_value(&v)),
|
||||
};
|
||||
} else {
|
||||
result = None;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user