Run monitorFn always on start #26 + bugfix

src/baseentity.js

@@ -17,6 +17,7 @@ class BaseEntity {
 		this.connection = connection;
 		this.apiToClientNames = {};
 		this.clientToApiNames = {};
+		this.lastRefreshTime = 0;
 		this.extra = {};
 		for(let i in properties) {
 			let backend, client;
@@ -59,9 +60,19 @@ class BaseEntity {
 				this[this.apiToClientNames[name]] = metadata[name];
 			}
 		}
+		this.lastRefreshTime = Date.now();
 		return this;
 	}
 
+	/**
+	 * Returns the age of the data in seconds.
+	 * 
+	 * @returns {integer}
+	 */
+	getDataAge() {
+		return (Date.now() - this.lastRefreshTime) / 1000;
+	}
+
 	/**
 	 * Returns all data in the model.
 	 * 

src/job.js

@@ -94,8 +94,8 @@ class Job extends BaseEntity {
 	/**
 	 * Checks for status changes and new log entries every x seconds.
 	 * 
-	 * On every status change observed or on new log entries (if supported by the back-end),
-	 * the callback is executed. It is also executed once at the beginning.
+	 * On every status change observed or on new log entries (if supported by the back-end), the callback is executed.
+	 * It is also executed once at the beginning if the data is older than the time specified in the interval.
 	 * The callback receives the updated job (this object) and the logs (array) passed.
 	 * 
 	 * The monitoring stops once the job has finished, was canceled or errored out.
@@ -118,7 +118,7 @@ class Job extends BaseEntity {
 			throw new Error('Monitoring Jobs not supported by the back-end.');
 		}
 
-		let lastStatus = null;
+		let lastStatus = this.status;
 		let intervalId = null;
 		let logIterator = null;
 		if (capabilities.hasFeature('debugJob')) {
@@ -135,7 +135,9 @@ class Job extends BaseEntity {
 				stopFn();
 			}
 		};
-		setTimeout(monitorFn, 0);
+		if (this.getDataAge() > interval) {
+			setTimeout(monitorFn, 0);
+		}
 		intervalId = setInterval(monitorFn, interval * 1000);
 		let stopFn = () => {
 			if (intervalId) {

src/service.js

@@ -80,8 +80,8 @@ class Service extends BaseEntity {
 	/**
 	 * Checks for new log entries every x seconds.
 	 * 
-	 * On every status change (enabled/disabled) observed or on new log entries (if supported by the back-end),
-	 * the callback is executed. It is also executed once at the beginning.
+	 * On every status change (enabled/disabled) observed or on new log entries (if supported by the back-end), the callback is executed.
+	 * It is also executed once at the beginning if the data is older than the time specified in the interval.
 	 * The callback receives the updated service (this object) and the logs (array) passed.
 	 * 
 	 * Returns a function that can be called to stop monitoring the service manually.
@@ -103,7 +103,7 @@ class Service extends BaseEntity {
 			throw new Error('Monitoring Services not supported by the back-end.');
 		}
 
-		let wasEnabled = null;
+		let wasEnabled = this.enabled;
 		let intervalId = null;
 		let logIterator = null;
 		if (capabilities.hasFeature('debugService')) {
@@ -117,7 +117,9 @@ class Service extends BaseEntity {
 			}
 			wasEnabled = this.enabled;
 		};
-		setTimeout(monitorFn, 0);
+		if (this.getDataAge() > interval) {
+			setTimeout(monitorFn, 0);
+		}
 		intervalId = setInterval(monitorFn, interval * 1000);
 		let stopFn = () => {
 			if (intervalId) {