tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not run consecutive crons if previous crons still ongoing

Browse Source
This commit is contained in:
Alessio Gravili
2025-08-23 00:03:45 -07:00
parent 88b52d6acb
commit bdc84f353f
2 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/payload/src/bin/index.ts
View File

@@ -40,7 +40,10 @@ export const bin = async () => {
// outside the Cron here.
await runBinScript({ args, script })
},
{ protect: true },
{
// Do not run consecutive crons if previous crons still ongoing
protect: true,
},
)
process.stdin.resume() // Keep the process alive

63
packages/payload/src/index.ts
View File

@@ -866,38 +866,45 @@ export class BasePayload {
await Promise.all(
cronJobs.map((cronConfig) => {
const jobAutorunCron = new Cron(cronConfig.cron ?? DEFAULT_CRON, async () => {
if (
_internal_jobSystemGlobals.shouldAutoSchedule &&
!cronConfig.disableScheduling &&
this.config.jobs.scheduling
) {
await this.jobs.handleSchedules({
allQueues: cronConfig.allQueues,
queue: cronConfig.queue,
})
}
const jobAutorunCron = new Cron(
cronConfig.cron ?? DEFAULT_CRON,
async () => {
if (
_internal_jobSystemGlobals.shouldAutoSchedule &&
!cronConfig.disableScheduling &&
this.config.jobs.scheduling
) {
await this.jobs.handleSchedules({
allQueues: cronConfig.allQueues,
queue: cronConfig.queue,
})
}
if (!_internal_jobSystemGlobals.shouldAutoRun) {
return
}
if (typeof this.config.jobs.shouldAutoRun === 'function') {
const shouldAutoRun = await this.config.jobs.shouldAutoRun(this)
if (!shouldAutoRun) {
jobAutorunCron.stop()
if (!_internal_jobSystemGlobals.shouldAutoRun) {
return
}
}
await this.jobs.run({
allQueues: cronConfig.allQueues,
limit: cronConfig.limit ?? DEFAULT_LIMIT,
queue: cronConfig.queue,
silent: cronConfig.silent,
})
})
if (typeof this.config.jobs.shouldAutoRun === 'function') {
const shouldAutoRun = await this.config.jobs.shouldAutoRun(this)
if (!shouldAutoRun) {
jobAutorunCron.stop()
return
}
}
await this.jobs.run({
allQueues: cronConfig.allQueues,
limit: cronConfig.limit ?? DEFAULT_LIMIT,
queue: cronConfig.queue,
silent: cronConfig.silent,
})
},
{
// Do not run consecutive crons if previous crons still ongoing
protect: true,
},
)
this.crons.push(jobAutorunCron)
}),