diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs index 5d15dedd72..7571174c21 100644 --- a/backend/windmill-worker/src/worker.rs +++ b/backend/windmill-worker/src/worker.rs @@ -417,7 +417,7 @@ pub async fn run_worker( let pip_trusted_host = std::env::var("PIP_TRUSTED_HOST").ok(); let max_log_size = std::env::var("MAX_LOG_SIZE") .ok() - .and_then(|x| x.parse::().ok()) + .and_then(|x| x.parse::().ok()) .unwrap_or(500000); #[cfg(feature = "enterprise")] @@ -739,7 +739,7 @@ struct Envs { pip_index_url: Option, pip_extra_index_url: Option, pip_trusted_host: Option, - max_log_size: i32, + max_log_size: i64, } #[tracing::instrument(level = "trace", skip_all)] @@ -2088,7 +2088,7 @@ async fn install_go_dependencies( job_dir: &str, db: &sqlx::Pool, timeout: i32, - max_log_size: i32, + max_log_size: i64, go_path: &str, preview: bool, skip_go_mod: bool, @@ -2192,7 +2192,7 @@ async fn handle_child( db: &Pool, logs: &mut String, timeout: i32, - max_log_size: i32, + max_log_size: i64, mut child: Child, ) -> error::Result<()> { let timeout = Duration::from_secs(u64::try_from(timeout).expect("invalid timeout")); @@ -2399,9 +2399,9 @@ async fn handle_child( kill_tx.send(()).expect("send should always work"); match wait_result { - _ if *too_many_logs.borrow() => Err(Error::ExecutionErr( - "logs or result reached limit".to_string(), - )), + _ if *too_many_logs.borrow() => Err(Error::ExecutionErr(format!( + "logs or result reached limit. Set MAX_LOG_SIZE higher (current: {max_log_size})" + ))), Ok(Ok(status)) => { if status.success() { Ok(()) diff --git a/frontend/src/lib/components/jobs/JobDetail.svelte b/frontend/src/lib/components/jobs/JobDetail.svelte index dbdfeaaf56..49e44e24db 100644 --- a/frontend/src/lib/components/jobs/JobDetail.svelte +++ b/frontend/src/lib/components/jobs/JobDetail.svelte @@ -22,6 +22,7 @@ faUser, faBarsStaggered } from '@fortawesome/free-solid-svg-icons' + import { CalendarClock } from 'lucide-svelte' import Icon from 'svelte-awesome' import { check } from 'svelte-awesome/icons' import { Badge } from '../common' @@ -144,41 +145,8 @@ > {/if} -
- {#if job && job.parent_job} - {#if job.is_flow_step} - - Step of flow {truncateRev(job.parent_job, 6)} - {:else} - - Triggered by parent {job.parent_job} - {/if} - {:else if job && job.schedule_path} - - Triggered by the schedule: - {/if} -
-
- - Created {displayDaysAgo(job.created_at ?? '')} -
{#if 'started_at' in job && job.started_at}
{/if} {#if 'scheduled_for' in job && !job.running && job.scheduled_for && forLater(job.scheduled_for)} -
- +
+ + Scheduled for {displayDate(job.scheduled_for ?? '')} @@ -208,6 +175,34 @@
{/if} +
+ {#if job && job.parent_job} + {#if job.is_flow_step} + + Step of flow {truncateRev(job.parent_job, 6)} + {:else} + + Parent {job.parent_job} + {/if} + {:else if job && job.schedule_path} + + Schedule + {/if} +
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte index 41ad0b80ce..cde07ea559 100644 --- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte @@ -1,7 +1,14 @@