tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix double filtering (#4409)

Browse Source
This commit is contained in:
Max Novich
2025-09-02 09:16:22 -07:00
committed by GitHub
parent 6807b6d0a3
commit f4e04694da
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose-server/src/routes/schedule.rs
+17 -21
View File
@@ -231,26 +231,17 @@ async fn run_now_handler(
.await .await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?; .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
let recipe_display_name = match scheduler.list_scheduled_jobs().await { let (recipe_display_name, recipe_version_opt) = match scheduler.list_scheduled_jobs().await {
Ok(jobs) => jobs Ok(jobs) => {
.into_iter() if let Some(job) = jobs.into_iter().find(|job| job.id == id) {
.find(|job| job.id == id) let recipe_display_name = std::path::Path::new(&job.source)
.and_then(|job| {
std::path::Path::new(&job.source)
.file_name() .file_name()
.and_then(|name| name.to_str()) .and_then(|name| name.to_str())
.map(|s| s.to_string()) .map(|s| s.to_string())
}) .unwrap_or_else(|| id.clone());
.unwrap_or_else(|| id.clone()),
Err(_) => id.clone(),
};
let recipe_version = match scheduler.list_scheduled_jobs().await { let recipe_version_opt = tokio::fs::read_to_string(&job.source)
Ok(jobs) => jobs .await
.into_iter()
.find(|job| job.id == id)
.and_then(|job| {
std::fs::read_to_string(&job.source)
.ok() .ok()
.and_then(|content| { .and_then(|content| {
goose::recipe::template_recipe::parse_recipe_content( goose::recipe::template_recipe::parse_recipe_content(
@@ -263,16 +254,21 @@ async fn run_now_handler(
) )
.ok() .ok()
.map(|(r, _)| r.version) .map(|(r, _)| r.version)
}) });
})
.unwrap_or_else(|| "unknown".to_string()), (recipe_display_name, recipe_version_opt)
Err(_) => "unknown".to_string(), } else {
(id.clone(), None)
}
}
Err(_) => (id.clone(), None),
}; };
let recipe_version_tag = recipe_version_opt.as_deref().unwrap_or("");
tracing::info!( tracing::info!(
counter.goose.recipe_runs = 1, counter.goose.recipe_runs = 1,
recipe_name = %recipe_display_name, recipe_name = %recipe_display_name,
recipe_version = %recipe_version, recipe_version = %recipe_version_tag,
session_type = "schedule", session_type = "schedule",
interface = "server", interface = "server",
"Recipe execution started" "Recipe execution started"