diff --git a/src/cron/run-id.ts b/src/cron/run-id.ts new file mode 100644 index 00000000000..4306c6d5a41 --- /dev/null +++ b/src/cron/run-id.ts @@ -0,0 +1,3 @@ +export function createCronExecutionId(jobId: string, startedAt: number): string { + return `cron:${jobId}:${startedAt}`; +} diff --git a/src/cron/service/ops.ts b/src/cron/service/ops.ts index f9c8f6f437a..3cfd8243aa4 100644 --- a/src/cron/service/ops.ts +++ b/src/cron/service/ops.ts @@ -6,6 +6,7 @@ import { createRunningTaskRun, failTaskRunByRunId, } from "../../tasks/detached-task-runtime.js"; +import { createCronExecutionId } from "../run-id.js"; import type { CronJob, CronJobCreate, CronJobPatch } from "../types.js"; import { applyJobPatch, @@ -394,10 +395,6 @@ type ManualRunPreflightResult = let nextManualRunId = 1; -function createCronTaskRunId(jobId: string, startedAt: number): string { - return `cron:${jobId}:${startedAt}`; -} - async function skipInvalidPersistedManualRun(params: { state: CronServiceState; job: CronJob; @@ -445,7 +442,7 @@ function tryCreateManualTaskRun(params: { job: CronJob; startedAt: number; }): string | undefined { - const runId = createCronTaskRunId(params.job.id, params.startedAt); + const runId = createCronExecutionId(params.job.id, params.startedAt); try { createRunningTaskRun({ runtime: "cron", diff --git a/src/cron/service/timer.ts b/src/cron/service/timer.ts index 70bf50dbfd4..80d0c51f32d 100644 --- a/src/cron/service/timer.ts +++ b/src/cron/service/timer.ts @@ -10,6 +10,7 @@ import { } from "../../tasks/detached-task-runtime.js"; import { clearCronJobActive, markCronJobActive } from "../active-jobs.js"; import { resolveCronDeliveryPlan } from "../delivery-plan.js"; +import { createCronExecutionId } from "../run-id.js"; import { sweepCronRunSessions } from "../session-reaper.js"; import type { CronDeliveryStatus, @@ -130,16 +131,12 @@ export function normalizeCronRunErrorText(err: unknown): string { return String(err); } -function createCronTaskRunId(jobId: string, startedAt: number): string { - return `cron:${jobId}:${startedAt}`; -} - function tryCreateCronTaskRun(params: { state: CronServiceState; job: CronJob; startedAt: number; }): string | undefined { - const runId = createCronTaskRunId(params.job.id, params.startedAt); + const runId = createCronExecutionId(params.job.id, params.startedAt); try { createRunningTaskRun({ runtime: "cron",