tweaks

salimkanoun · Jul 6, 2021 · ace5557 · ace5557
1 parent 3226c6d
commit ace5557
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 22 deletions.
diff --git a/FrontEnd/src/tools/MonitorJob.js b/FrontEnd/src/tools/MonitorJob.js
@@ -1,58 +1,72 @@
-import { toast } from 'react-toastify'
+import {toast} from 'react-toastify'
 import apis from '../services/apis'
 
 export default class MonitorJob {
 
-    constructor(jobID, interval=1000){
+    constructor(jobID, interval = 1000) {
         this.jobID = jobID
         this.interval = interval
-        this.finishCallback = function(status){}
-        this.updateCallBack = function(progress){}
+        this.continue = false
+        this.finishCallback = function (status) {
+        }
+        this.updateCallBack = function (progress) {
+        }
     }
 
-    onFinish(callback){
+    onFinish(callback) {
         this.finishCallback = callback
     }
 
-    onUpdate(callback){
+    onUpdate(callback) {
         this.updateCallBack = callback
     }
 
     startMonitoringJob() {
-        this.intervalChcker = setInterval(() => this.jobMonitoring(this.jobID), this.interval)
+        this.continue = true;
+        this.jobMonitoring(this.jobID)
     }
 
     stopMonitoringJob() {
-        if(this.intervalChcker !== undefined) clearInterval(this.intervalChcker)
+        this.continue = false;
     }
 
-    async cancelJob(){
-        await apis.jobs.cancelJob(this.jobID).catch(error => {toast.error(error.statusText)})
+    async cancelJob() {
+        await apis.jobs.cancelJob(this.jobID).catch(error => {
+            toast.error(error.statusText)
+        })
         toast.success('Job Cancelled')
         this.stopMonitoringJob()
     }
 
     async jobMonitoring(jobUID) {
         let jobData
+        let queryStartTime = Date.now();
 
-        try{
-             jobData = await apis.jobs.getJobInfos(jobUID)
-        } catch(error){
+        try {
+            jobData = await apis.jobs.getJobInfos(jobUID)
+        } catch (error) {
             console.error(error)
             this.stopMonitoringJob()
             toast.error('Monitoring Failed')
             return
         }
-        
+
         const currentStatus = jobData.State
-    
+
         this.updateCallBack(jobData.Progress)
-
-        if (currentStatus === MonitorJob.Success || currentStatus === MonitorJob.Failure ) {
-          this.stopMonitoringJob()
-          this.finishCallback(currentStatus)
+
+        if (this.continue) {
+            setTimeout(() => {
+                this.jobMonitoring(this.jobID)
+            }, this.interval - (Date.now() - queryStartTime))
         }
-
+
+        if (currentStatus === MonitorJob.Success || currentStatus === MonitorJob.Failure) {
+            this.stopMonitoringJob()
+            this.finishCallback(currentStatus)
+        }
+
+
     }
 }
 

diff --git a/FrontEnd/src/tools/MonitorTask.js b/FrontEnd/src/tools/MonitorTask.js
@@ -9,8 +9,9 @@ export default class MonitorTask extends MonitorJob {
     cancel() {
         console.warn("export job supression not implemented")
     }
-    
+
     async jobMonitoring(jobUuid) {
+        let queryStartTime = Date.now();
 
         let task
         try {
@@ -24,7 +25,13 @@ export default class MonitorTask extends MonitorJob {
 
         this.updateCallBack(task)
 
-        if (task.state === 'completed'||task.state === 'failed') {
+        if (this.continue) {
+            setTimeout(() => {
+                this.jobMonitoring(this.jobID)
+            }, this.interval - (Date.now() - queryStartTime))
+        }
+
+        if (task.state === 'completed' || task.state === 'failed') {
             this.stopMonitoringJob()
             this.finishCallback(task)
         }