fix(core): update
This commit is contained in:
parent
a7a961c869
commit
457182a97a
@ -21,18 +21,29 @@ export class CronJob {
|
||||
*/
|
||||
public checkExecution(): number {
|
||||
if (this.nextExecutionUnix === 0) {
|
||||
this.nextExecutionUnix = Date.now() + this.croner.msToNext();
|
||||
this.getNextExecutionTime();
|
||||
}
|
||||
if (Date.now() > this.nextExecutionUnix) {
|
||||
const maybePromise = this.jobFunction();
|
||||
if (maybePromise instanceof Promise) {
|
||||
maybePromise.catch(e => console.log(e));
|
||||
}
|
||||
this.nextExecutionUnix = Date.now() + this.croner.msToNext();
|
||||
this.nextExecutionUnix = this.getNextExecutionTime();
|
||||
}
|
||||
return this.nextExecutionUnix;
|
||||
}
|
||||
|
||||
public getNextExecutionTime() {
|
||||
return this.nextExecutionUnix = Date.now() + this.getTimeToNextExecution();
|
||||
}
|
||||
|
||||
/**
|
||||
* gets the time to next execution
|
||||
*/
|
||||
public getTimeToNextExecution() {
|
||||
return this.croner.msToNext();
|
||||
}
|
||||
|
||||
public start() {
|
||||
this.status = 'started';
|
||||
}
|
||||
|
@ -36,18 +36,17 @@ export class CronManager {
|
||||
const runCronCycle = async () => {
|
||||
this.executionTimeout = new plugins.smartdelay.Timeout(0);
|
||||
do {
|
||||
let timeToNextOverallExecution: number;
|
||||
let nextRunningCronjob: CronJob;
|
||||
for (const cronJob of this.cronjobs.getArray()) {
|
||||
const nextExecutionTime = cronJob.checkExecution();
|
||||
const timeToNextJobExecution = nextExecutionTime - Date.now();
|
||||
cronJob.checkExecution();
|
||||
if (
|
||||
timeToNextJobExecution < timeToNextOverallExecution ||
|
||||
!timeToNextOverallExecution
|
||||
!nextRunningCronjob ||
|
||||
cronJob.getTimeToNextExecution() < nextRunningCronjob.getTimeToNextExecution()
|
||||
) {
|
||||
timeToNextOverallExecution = timeToNextJobExecution;
|
||||
nextRunningCronjob = cronJob;
|
||||
}
|
||||
}
|
||||
this.executionTimeout = new plugins.smartdelay.Timeout(timeToNextOverallExecution);
|
||||
this.executionTimeout = new plugins.smartdelay.Timeout(nextRunningCronjob.getTimeToNextExecution());
|
||||
console.log(
|
||||
`Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user