From 82d7dfdfdbd74ed6a02bd86486d2042fe87a4f39 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 11 Feb 2024 23:26:06 +0100 Subject: [PATCH] more tracing around scheduled jobs --- backend/windmill-queue/src/jobs.rs | 8 ++++++++ cli/script.ts | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs index 55946d1776..9a1f8f55d2 100644 --- a/backend/windmill-queue/src/jobs.rs +++ b/backend/windmill-queue/src/jobs.rs @@ -969,6 +969,7 @@ pub async fn handle_maybe_scheduled_job<'c, R: rsmq_async::RsmqConnection + Clon script_path: &str, w_id: &str, ) -> windmill_common::error::Result> { + tracing::info!("Schedule {schedule_path} scheduling next job for {script_path} in {w_id}",); let schedule = get_schedule_opt(tx.transaction_mut(), w_id, schedule_path).await?; if schedule.is_none() { @@ -1031,6 +1032,13 @@ pub async fn handle_maybe_scheduled_job<'c, R: rsmq_async::RsmqConnection + Clon } } } else { + if script_path != schedule.script_path { + tracing::warn!( + "Schedule {schedule_path} in {w_id} has a different script path than the job. Not scheduling again" + ); + } else { + tracing::info!("Schedule {schedule_path} in {w_id} is disabled. Not scheduling again."); + } Ok(tx) } } diff --git a/cli/script.ts b/cli/script.ts index a2ab945046..51333121e5 100644 --- a/cli/script.ts +++ b/cli/script.ts @@ -704,7 +704,7 @@ const command = new Command() ) .action(run as any) .command("bootstrap", "create a new script") - .arguments(" ") + .arguments(" ") .option("--summary ", "script summary") .option("--description ", "script description") .action(bootstrap as any) @@ -712,7 +712,7 @@ const command = new Command() "generate-metadata", "re-generate the metadata file updating the lock and the script schema" ) - .arguments("[script:string]") + .arguments("[script:file]") .option("--yes", "Skip confirmation prompt") .option("--lock-only", "re-generate only the lock") .option("--schema-only", "re-generate only script schema")