mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Log connectiong problems while fetching data from appstore 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-05-11 17:46:41 -05:00
parent d83f1d96d4
commit c90d832ce4
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/App/AppStore/Fetcher/AppFetcher.php
View File

@ -26,23 +26,27 @@ use OC\Files\AppData\Factory;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
class AppFetcher extends Fetcher {
/**
* @param Factory $appDataFactory
* @param IClientService $clientService
* @param ITimeFactory $timeFactory
* @param IConfig $config;
* @param IConfig $config
* @param ILogger $logger
*/
public function __construct(Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
IConfig $config) {
IConfig $config,
ILogger $logger) {
parent::__construct(
$appDataFactory,
$clientService,
$timeFactory,
$config
$config,
$logger
);
$this->fileName = 'apps.json';

8
lib/private/App/AppStore/Fetcher/CategoryFetcher.php
View File

@ -25,6 +25,7 @@ use OC\Files\AppData\Factory;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
class CategoryFetcher extends Fetcher {
/**
@ -32,16 +33,19 @@ class CategoryFetcher extends Fetcher {
* @param IClientService $clientService
* @param ITimeFactory $timeFactory
* @param IConfig $config
* @param ILogger $logger
*/
public function __construct(Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
IConfig $config) {
IConfig $config,
ILogger $logger) {
parent::__construct(
$appDataFactory,
$clientService,
$timeFactory,
$config
$config,
$logger
);
$this->fileName = 'categories.json';
$this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';

12
lib/private/App/AppStore/Fetcher/Fetcher.php
View File

@ -22,12 +22,14 @@
namespace OC\App\AppStore\Fetcher;
use OC\Files\AppData\Factory;
use GuzzleHttp\Exception\ConnectException;
use OCP\AppFramework\Http;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
abstract class Fetcher {
const INVALIDATE_AFTER_SECONDS = 300;
@ -40,6 +42,8 @@ abstract class Fetcher {
protected $timeFactory;
/** @var IConfig */
protected $config;
/** @var Ilogger */
protected $logger;
/** @var string */
protected $fileName;
/** @var string */
@ -52,15 +56,18 @@ abstract class Fetcher {
* @param IClientService $clientService
* @param ITimeFactory $timeFactory
* @param IConfig $config
* @param ILogger $logger
*/
public function __construct(Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
IConfig $config) {
IConfig $config,
ILogger $logger) {
$this->appData = $appDataFactory->get('appstore');
$this->clientService = $clientService;
$this->timeFactory = $timeFactory;
$this->config = $config;
$this->logger = $logger;
}
/**
@ -153,6 +160,9 @@ abstract class Fetcher {
$responseJson = $this->fetch($ETag, $content);
$file->putContent(json_encode($responseJson));
return json_decode($file->getContent(), true)['data'];
} catch (ConnectException $e) {
$this->logger->logException($e, ['app' => 'appstoreFetcher']);
return [];
} catch (\Exception $e) {
return [];
}