extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-02-16 18:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance logging during Release radar scan

Browse Source
This commit is contained in:
Bubka 2023-03-17 13:37:56 +01:00
parent 140cc70cef
commit 2eaaf2bea8
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Events/ScanForNewReleaseCalled.php
View File

@ -18,6 +18,6 @@ class ScanForNewReleaseCalled
*/
public function __construct()
{
Log::info('ReleaseRadarActivated event dispatched');
Log::debug('ReleaseRadarActivated event dispatched');
}
}

3
app/Listeners/ReleaseRadar.php
View File

@ -4,7 +4,6 @@
use App\Events\ScanForNewReleaseCalled;
use App\Services\ReleaseRadarService;
use Illuminate\Support\Facades\Log;
class ReleaseRadar
{
@ -28,7 +27,5 @@ public function handle(ScanForNewReleaseCalled $event)
{
$releaseRadarService = app()->make(ReleaseRadarService::class);
$releaseRadarService::scheduledScan();
Log::info('Scheduled release scan complete');
}
}

10
app/Services/ReleaseRadarService.php
View File

@ -38,6 +38,8 @@ public static function manualScan() : false|string
*/
protected static function newRelease() : false|string
{
Log::info('Release scan started');
if ($latestReleaseData = json_decode(self::getLatestReleaseData())) {
$githubVersion = Helpers::cleanVersionNumber($latestReleaseData->tag_name);
$installedVersion = Helpers::cleanVersionNumber(config('2fauth.version'));
@ -46,6 +48,8 @@ protected static function newRelease() : false|string
if (version_compare($githubVersion, $installedVersion) > 0 && $latestReleaseData->prerelease == false && $latestReleaseData->draft == false) {
Settings::set('latestRelease', $latestReleaseData->tag_name);
Log::info(sprintf('New release found: %s', var_export($latestReleaseData->tag_name, true)));
return $latestReleaseData->tag_name;
} else {
Settings::delete('latestRelease');
@ -63,9 +67,11 @@ protected static function newRelease() : false|string
*/
protected static function getLatestReleaseData() : string|null
{
$url = config('2fauth.latestReleaseUrl');
try {
$response = Http::retry(3, 100)
->get(config('2fauth.latestReleaseUrl'));
->get($url);
if ($response->successful()) {
Settings::set('lastRadarScan', time());
@ -73,7 +79,7 @@ protected static function getLatestReleaseData() : string|null
return $response->body();
}
} catch (\Exception $exception) {
Log::error('cannot reach latestReleaseUrl endpoint');
Log::error(sprintf('cannot reach %s endpoint', var_export($url, true)));
}
return null;