mirror of
https://github.com/pelican-dev/panel.git
synced 2026-05-04 18:00:48 +03:00
Do not throw error when checking for egg updates (#2256)
This commit is contained in:
@@ -8,7 +8,6 @@ use App\Services\Eggs\Sharing\EggExporterService;
|
|||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
use JsonException;
|
|
||||||
use Symfony\Component\Yaml\Yaml;
|
use Symfony\Component\Yaml\Yaml;
|
||||||
|
|
||||||
class CheckEggUpdatesCommand extends Command
|
class CheckEggUpdatesCommand extends Command
|
||||||
@@ -22,14 +21,12 @@ class CheckEggUpdatesCommand extends Command
|
|||||||
try {
|
try {
|
||||||
$this->check($egg, $exporterService);
|
$this->check($egg, $exporterService);
|
||||||
} catch (Exception $exception) {
|
} catch (Exception $exception) {
|
||||||
$this->error("{$egg->name}: Error ({$exception->getMessage()})");
|
$this->error("$egg->name: Error ({$exception->getMessage()})");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @throws Exception */
|
||||||
* @throws JsonException
|
|
||||||
*/
|
|
||||||
private function check(Egg $egg, EggExporterService $exporterService): void
|
private function check(Egg $egg, EggExporterService $exporterService): void
|
||||||
{
|
{
|
||||||
if (is_null($egg->update_url)) {
|
if (is_null($egg->update_url)) {
|
||||||
@@ -45,7 +42,13 @@ class CheckEggUpdatesCommand extends Command
|
|||||||
? Yaml::parse($exporterService->handle($egg->id, EggFormat::YAML))
|
? Yaml::parse($exporterService->handle($egg->id, EggFormat::YAML))
|
||||||
: json_decode($exporterService->handle($egg->id, EggFormat::JSON), true);
|
: json_decode($exporterService->handle($egg->id, EggFormat::JSON), true);
|
||||||
|
|
||||||
$remote = Http::timeout(5)->connectTimeout(1)->get($egg->update_url)->throw()->body();
|
$remote = Http::timeout(5)->connectTimeout(1)->get($egg->update_url);
|
||||||
|
|
||||||
|
if ($remote->failed()) {
|
||||||
|
throw new Exception("HTTP request returned status code {$remote->status()}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$remote = $remote->body();
|
||||||
$remote = $isYaml ? Yaml::parse($remote) : json_decode($remote, true);
|
$remote = $isYaml ? Yaml::parse($remote) : json_decode($remote, true);
|
||||||
|
|
||||||
unset($local['exported_at'], $remote['exported_at']);
|
unset($local['exported_at'], $remote['exported_at']);
|
||||||
|
|||||||
Reference in New Issue
Block a user