From fe7e7c6bafc6e2a17541c522eaa43e135ac3fdab Mon Sep 17 00:00:00 2001
From: "a.croix" <croix.alexandre@gmail.com>
Date: Thu, 20 May 2021 14:45:54 +0200
Subject: [PATCH] Correct processorJobId in WowaJob + correct condition in
getJobProgression method
---
app/Jobs/WowaJob.php | 1 +
app/Log.php | 3 +++
2 files changed, 4 insertions(+)
diff --git a/app/Jobs/WowaJob.php b/app/Jobs/WowaJob.php
index f45925c..056de6d 100644
--- a/app/Jobs/WowaJob.php
+++ b/app/Jobs/WowaJob.php
@@ -102,6 +102,7 @@ class WowaJob implements ShouldQueue
$this->wowa->status = Wowa::STATE_RUNNING;
$this->wowa->save();
$processor->setTrainingBooleanTrue();
+ $processor->setJobId($this->wowa->id);
$logg->pushProcessor($processor);
try {
$solution = $trainer->run($this->evidences, $this->is_true_alert);
diff --git a/app/Log.php b/app/Log.php
index 8cd45b7..e5e1788 100644
--- a/app/Log.php
+++ b/app/Log.php
@@ -23,6 +23,9 @@ class Log extends Model
} elseif ($wowa->status == Wowa::STATE_RUNNING || $wowa->status == Wowa::STATE_SUCCESS) {
$log = self::where('job_id', '=', $wowa->id)
->where('training', '=', true)->orderBy('progression', 'desc')->first();
+ if (!is_object($log)) {
+ return "Calculation progress...";
+ }
return ((($log->progression + 1) / $wowa->generation_number) * 100);
} else {
return 'Error';
--
GitLab