From c174dc83125fef9d8589285ef2391c217df878ec Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 27 May 2022 10:50:44 +0200 Subject: [PATCH] backend-tasks: update usage of cron Signed-off-by: Patrik Oldsberg --- packages/backend-tasks/src/tasks/LocalTaskWorker.ts | 2 +- packages/backend-tasks/src/tasks/TaskWorker.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/backend-tasks/src/tasks/LocalTaskWorker.ts b/packages/backend-tasks/src/tasks/LocalTaskWorker.ts index b7dd7c96c1..be30988aa8 100644 --- a/packages/backend-tasks/src/tasks/LocalTaskWorker.ts +++ b/packages/backend-tasks/src/tasks/LocalTaskWorker.ts @@ -123,7 +123,7 @@ export class LocalTaskWorker { let dt: number; if (isCron) { - const nextRun = +new CronTime(settings.cadence).sendAt().toDate(); + const nextRun = +new CronTime(settings.cadence).sendAt().toJSDate(); dt = nextRun - Date.now(); } else { dt = diff --git a/packages/backend-tasks/src/tasks/TaskWorker.ts b/packages/backend-tasks/src/tasks/TaskWorker.ts index 07e1cd90ec..db1cf8d01b 100644 --- a/packages/backend-tasks/src/tasks/TaskWorker.ts +++ b/packages/backend-tasks/src/tasks/TaskWorker.ts @@ -174,8 +174,9 @@ export class TaskWorker { } else if (isCron) { const time = new CronTime(settings.cadence) .sendAt() - .add({ seconds: -1 }) // immediately, if "* * * * * *" - .toISOString(); + .minus({ seconds: 1 }) // immediately, if "* * * * * *" + .toUTC() + .toISO(); startAt = this.knex.client.config.client.includes('sqlite3') ? this.knex.raw('datetime(?)', [time]) : this.knex.raw(`?`, [time]); @@ -278,7 +279,7 @@ export class TaskWorker { let nextRun: Knex.Raw; if (isCron) { - const time = new CronTime(settings.cadence).sendAt().toISOString(); + const time = new CronTime(settings.cadence).sendAt().toUTC().toISO(); this.logger.debug(`task: ${this.taskId} will next occur around ${time}`); nextRun = this.knex.client.config.client.includes('sqlite3') ? this.knex.raw('datetime(?)', [time])