Skip to content
Snippets Groups Projects
Commit f6025c3b authored by a.croix's avatar a.croix
Browse files

Prepare for 2 log method choice

parent 2cae7300
No related branches found
No related tags found
1 merge request!2New Log system
Pipeline #6178 passed
......@@ -3,6 +3,7 @@
namespace App\Jobs;
use App\Feedback;
use App\Logging\LogProcessor;
use App\Mark;
use App\Wowa;
use Illuminate\Bus\Queueable;
......@@ -54,6 +55,10 @@ class WowaJob implements ShouldQueue
$this->wowa->save();
return;
}
$processor = new LogProcessor();
$processor->setJobId($this->wowa->id);
$logg->pushProcessor($processor);
try {
//Begin Data Collection
......@@ -79,6 +84,10 @@ class WowaJob implements ShouldQueue
$logg->error("Error during retrieving evidences");
$this->wowa->save();
}
$processor->setTrainingBooleanTrue();
$processor->setJobId($this->wowa->id);
$logg->pushProcessor($processor);
//Training Parameters with logger previsouly created
$training_prameters = new TrainerParameters(
$logg,
......
......@@ -11,7 +11,7 @@ class Log extends Model
protected $guarded = ['id'];
public static function getJobProgression(Wowa $wowa)
public static function getProgression(Wowa $wowa)
{
if ($wowa->status == Wowa::STATE_COLLECTION) {
$log = self::where('job_id', '=', $wowa->id)
......
......@@ -12,7 +12,6 @@ class LogTraining
$logger = new Logger('training_logger');
$handler = new LogTrainingHandler();
//$processor = new LogProcessor();
//$processor->setJobId(26);
$logger->pushHandler($handler);
//$logger->pushProcessor($processor);
return $logger;
......
......@@ -2,8 +2,8 @@
namespace App;
use App\Logging\LogTraining;
use Illuminate\Database\Eloquent\Model;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
class Wowa extends Model
......@@ -113,8 +113,7 @@ class Wowa extends Model
//Create a Logger instance. The log will be stored in a log file. File path is given by getLogPathOnDisk method.
public function logger() : Logger
{
$logger = new Logger("Wowa");
$logger->pushHandler(new StreamHandler($this->getLogPathOnDisk()));
$logger = new LogTraining("Wowa");
return $logger;
}
}
......@@ -26,7 +26,7 @@
<td>{{ $wowa->user_id}}</td>
<td>{{ $wowa->score }}</td>
<td>{{ $wowa->status }}</td>
<td>{{ $wowa->getProgression() }} </td>
<td>{{ \App\Log::getProgression($wowa) }} </td>
<td class="text-right">
<a class="btn btn-primary btn-sm"
href="{{ action('WowaController@show', ['wowa' => $wowa]) }}">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment