Compare commits

..

6 Commits

Author SHA1 Message Date
743c9fb847 3.0.25 2020-09-02 14:09:22 +00:00
ac2edd6d74 fix(core): update 2020-09-02 14:09:21 +00:00
725102d02c 3.0.24 2020-07-12 00:25:56 +00:00
7c73579c9f fix(core): update 2020-07-12 00:25:55 +00:00
a1996ea1bd 3.0.23 2020-07-12 00:00:50 +00:00
dc92ae7140 fix(core): update 2020-07-12 00:00:50 +00:00
4 changed files with 36 additions and 24 deletions

2
package-lock.json generated

@@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smarttime", "name": "@pushrocks/smarttime",
"version": "3.0.22", "version": "3.0.25",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

@@ -1,7 +1,7 @@
{ {
"name": "@pushrocks/smarttime", "name": "@pushrocks/smarttime",
"private": false, "private": false,
"version": "3.0.22", "version": "3.0.25",
"description": "handle time in smart ways", "description": "handle time in smart ways",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
"typings": "dist_ts/index.d.ts", "typings": "dist_ts/index.d.ts",

@@ -1,4 +1,5 @@
export * from './smarttime.classes.cronmanager'; export * from './smarttime.classes.cronmanager';
export * from './smarttime.classes.cronjob';
export * from './smarttime.classes.extendeddate'; export * from './smarttime.classes.extendeddate';
export * from './smarttime.classes.hrtmeasurement'; export * from './smarttime.classes.hrtmeasurement';
export * from './smarttime.classes.interval'; export * from './smarttime.classes.interval';

@@ -28,6 +28,7 @@ export class CronManager {
* starts the cronjob * starts the cronjob
*/ */
public start() { public start() {
if (this.status !== 'started') {
this.status = 'started'; this.status = 'started';
for (const cronJob of this.cronjobs.getArray()) { for (const cronJob of this.cronjobs.getArray()) {
cronJob.start(); cronJob.start();
@@ -36,12 +37,17 @@ export class CronManager {
// recursion // recursion
const runCheckExecution = () => { const runCheckExecution = () => {
console.log(`Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`); console.log(
`Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`
);
this.executionTimeout.promise.then(() => { this.executionTimeout.promise.then(() => {
let timeToNextOverallExecution: number; let timeToNextOverallExecution: number;
for (const cronJob of this.cronjobs.getArray()) { for (const cronJob of this.cronjobs.getArray()) {
const timeToNextJobExecution = cronJob.checkExecution(); const timeToNextJobExecution = cronJob.checkExecution();
if (timeToNextJobExecution < timeToNextOverallExecution || !timeToNextOverallExecution) { if (
timeToNextJobExecution < timeToNextOverallExecution ||
!timeToNextOverallExecution
) {
timeToNextOverallExecution = timeToNextJobExecution; timeToNextOverallExecution = timeToNextJobExecution;
} }
} }
@@ -52,13 +58,18 @@ export class CronManager {
runCheckExecution(); runCheckExecution();
} }
}
/** /**
* stops all cronjobs * stops all cronjobs
*/ */
public stop() { public stop() {
if (this.status === 'started') {
this.status = 'stopped'; this.status = 'stopped';
this.executionTimeout.cancel(); this.executionTimeout.cancel();
} else {
console.log(`You tried to stop a CronManager that was not actually started.`);
}
for (const cron of this.cronjobs.getArray()) { for (const cron of this.cronjobs.getArray()) {
cron.stop(); cron.stop();
} }