Run monitorFn always on start #26 + bugfix

src/job.js

@@ -95,7 +95,7 @@ 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.
+	 * the callback is executed. It is also executed once at the beginning.
 	 * The callback receives the 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 = this.status;
+		let lastStatus = null;
 		let intervalId = null;
 		let logIterator = null;
 		if (capabilities.hasFeature('debugJob')) {
@@ -135,7 +135,8 @@ class Job extends BaseEntity {
 				stopFn();
 			}
 		};
-		intervalId = setTimeout(monitorFn, interval * 1000);
+		setTimeout(monitorFn, 0);
+		intervalId = setInterval(monitorFn, interval * 1000);
 		let stopFn = () => {
 			if (intervalId) {
 				clearInterval(intervalId);

src/service.js

@@ -81,7 +81,7 @@ 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.
+	 * the callback is executed. It is also executed once at the beginning.
 	 * The callback receives the 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 = this.enabled;
+		let wasEnabled = null;
 		let intervalId = null;
 		let logIterator = null;
 		if (capabilities.hasFeature('debugService')) {
@@ -117,7 +117,8 @@ class Service extends BaseEntity {
 			}
 			wasEnabled = this.enabled;
 		};
-		intervalId = setTimeout(monitorFn, interval * 1000);
+		setTimeout(monitorFn, 0);
+		intervalId = setInterval(monitorFn, interval * 1000);
 		let stopFn = () => {
 			if (intervalId) {
 				clearInterval(intervalId);