mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2026-01-04 12:04:54 +01:00
Code Issues Projects Releases Wiki Activity

Moved speedtest logic into interface

Browse Source
This commit is contained in:
Henry Whitaker
2021-03-07 10:26:09 +00:00
parent ba8f82aa98
commit a2d8886bae
10 changed files with 315 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Jobs/SpeedtestJob.php
View File

@@ -6,6 +6,8 @@ use App\Events\SpeedtestCompleteEvent;
use App\Events\SpeedtestFailedEvent;
use App\Helpers\SettingsHelper;
use App\Helpers\SpeedtestHelper;
use App\Interfaces\SpeedtestProvider;
use App\Utils\OoklaTester;
use Exception;
use Healthcheck;
use Henrywhitaker3\Healthchecks\Healthchecks;
@@ -34,15 +36,18 @@ class SpeedtestJob implements ShouldQueue
*/
private $config;
private SpeedtestProvider $speedtestProvider;
/**
* Create a new job instance.
*
* @return void
*/
public function __construct($scheduled = true, $config = [])
public function __construct($scheduled = true, $config = [], SpeedtestProvider $speedtestProvider)
{
$this->scheduled = $scheduled;
$this->config = $config;
$this->speedtestProvider = $speedtestProvider;
}
/**
@@ -55,8 +60,8 @@ class SpeedtestJob implements ShouldQueue
if ($this->config['healthchecks_enabled'] === true) {
$this->healthcheck('start');
}
$output = SpeedtestHelper::output();
$speedtest = SpeedtestHelper::runSpeedtest($output, $this->scheduled);
$output = $this->speedtestProvider->output();
$speedtest = $this->speedtestProvider->run($output, $this->scheduled);
if ($speedtest == false) {
if ($this->config['healthchecks_enabled'] === true) {
$this->healthcheck('fail');