From fe3da625b61c4a2fcec261f397fc818bcbc7353c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 25 Jul 2023 10:15:42 +0200 Subject: [minilinux] Better error handling if list download fails --- modules-available/minilinux/inc/minilinux.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules-available/minilinux/inc/minilinux.inc.php b/modules-available/minilinux/inc/minilinux.inc.php index 47d14a86..44e8bacb 100644 --- a/modules-available/minilinux/inc/minilinux.inc.php +++ b/modules-available/minilinux/inc/minilinux.inc.php @@ -54,15 +54,16 @@ class MiniLinux */ public static function listDownloadCallback($task, $sourceid) { - if ($task['statusCode'] !== 'TASK_FINISHED') + if (!Taskmanager::isFinished($task)) return; $taskId = $task['id']; $data = json_decode($task['data']['content'], true); - if (!is_array($data)) { - EventLog::warning('Cannot download Linux version meta data for ' . $sourceid); + if (!is_array($data) || empty($data['systems'])) { + EventLog::warning('Cannot download Linux version meta data for ' . $sourceid, + ($task['data']['error'] ?? '') . "\n\nContent:\n" . $task['data']['content']); $lastupdate = 'lastupdate'; } else { - if (@is_array($data['systems'])) { + if (is_array($data['systems'])) { self::addBranches($sourceid, $data['systems']); } $lastupdate = 'UNIX_TIMESTAMP()'; -- cgit v1.2.3-55-g7522