From b97f436672d5cffc0515b1d4b39761db1fa5f516 Mon Sep 17 00:00:00 2001
From: "a.croix" <croix.alexandre@gmail.com>
Date: Tue, 8 Jun 2021 17:56:40 +0200
Subject: [PATCH] Correction to dispplay progression in Wowa index blade
---
app/Jobs/WowaJob.php | 2 +-
app/Log.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/Jobs/WowaJob.php b/app/Jobs/WowaJob.php
index a2f0878..0646ee4 100644
--- a/app/Jobs/WowaJob.php
+++ b/app/Jobs/WowaJob.php
@@ -52,7 +52,7 @@ class WowaJob implements ShouldQueue
public function handle()
{
$logg = \Log::channel('custom');
- //$logger->pushHandler(new StreamHandler(__DIR__ . '/../../storage/logs/training.log', Logger::INFO));
+ //$logger->pushHandler(new StreamHandler(__DIR__ . '/../../storage/logs/debug.log', Logger::INFO));
$this->wowa->status = Wowa::STATE_RUNNING;
$this->wowa->start_time = time();
$this->wowa->save();
diff --git a/app/Log.php b/app/Log.php
index 525b545..0eb7403 100644
--- a/app/Log.php
+++ b/app/Log.php
@@ -16,6 +16,9 @@ class Log extends Model
if ($wowa->status == Wowa::STATE_COLLECTION) {
$log = self::where('job_id', '=', $wowa->id)
->where('training', '=', false)->orderBy('progression', 'desc')->first();
+ if (!is_object($log)) {
+ return "Computation in progress...";
+ }
return $log->progression;
} elseif ($wowa->status == Wowa::STATE_RUNNING) {
$log = self::where('job_id', '=', $wowa->id)
--
GitLab