Skip to content

Fix cron overlap skipping by persisting executionJobId #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leventov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix cron overlap skipping by persisting executionJobId #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/component/public.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,15 @@ async function scheduleNextRun(
id: Id<"crons">,
lastScheduled: Date,
schedule: Schedule,
extraPatch?: Partial<Pick<Doc<"crons">, "executionJobId">>,
) {
const nextRun = calculateNextRun(lastScheduled, schedule);
const schedulerJobId = await ctx.scheduler.runAt(
nextRun,
internal.public.rescheduler,
{ id },
);
await ctx.db.patch(id, { schedulerJobId });
await ctx.db.patch(id, { schedulerJobId, ...extraPatch });
}

function calculateNextRun(lastScheduled: Date, schedule: Schedule): Date {
Expand Down Expand Up @@ -296,18 +297,21 @@ export const rescheduler = internalMutation({
console.log(`Cron ${cronJob._id} still running, skipping this run.`);
} else {
console.log(`Running cron ${cronJob._id}.`);
await ctx.scheduler.runAfter(
const executionJobId = await ctx.scheduler.runAfter(
0,
cronJob.functionHandle as FunctionHandle<"mutation" | "action">,
cronJob.args,
);
await scheduleNextRun(
ctx,
id,
new Date(schedulerJob.scheduledTime),
cronJob.schedule,
{ executionJobId },
);
return;
}

await scheduleNextRun(
ctx,
id,
new Date(schedulerJob.scheduledTime),
cronJob.schedule,
);
await scheduleNextRun(ctx, id, new Date(schedulerJob.scheduledTime), cronJob.schedule);
},
});