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

Cache appstore requests for 60 instead of 5 minutes 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-05-19 23:04:25 +02:00 committed by backportbot[bot]
parent 5763ce2761
commit 5c0f06b259
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ use OCP\IConfig;
use OCP\ILogger; use OCP\ILogger;
abstract class Fetcher { abstract class Fetcher {
public const INVALIDATE_AFTER_SECONDS = 300; public const INVALIDATE_AFTER_SECONDS = 3600;
/** @var IAppData */ /** @var IAppData */
protected $appData; protected $appData;
@ -153,7 +153,7 @@ abstract class Fetcher {
// No caching when the version has been updated // No caching when the version has been updated
if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) { if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
// If the timestamp is older than 300 seconds request the files new // If the timestamp is older than 3600 seconds request the files new
if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) { if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
return $jsonBlob['data']; return $jsonBlob['data'];
} }

14
tests/lib/App/AppStore/Fetcher/FetcherBase.php
View File

@ -239,7 +239,7 @@ abstract class FetcherBase extends TestCase {
$this->timeFactory $this->timeFactory
->expects($this->at(0)) ->expects($this->at(0))
->method('getTime') ->method('getTime')
->willReturn(1501); ->willReturn(4801);
$client = $this->createMock(IClient::class); $client = $this->createMock(IClient::class);
$this->clientService $this->clientService
->expects($this->once()) ->expects($this->once())
@ -533,11 +533,11 @@ abstract class FetcherBase extends TestCase {
$this->timeFactory $this->timeFactory
->expects($this->at(0)) ->expects($this->at(0))
->method('getTime') ->method('getTime')
->willReturn(1501); ->willReturn(4801);
$this->timeFactory $this->timeFactory
->expects($this->at(1)) ->expects($this->at(1))
->method('getTime') ->method('getTime')
->willReturn(1502); ->willReturn(4802);
$client = $this->createMock(IClient::class); $client = $this->createMock(IClient::class);
$this->clientService $this->clientService
->expects($this->once()) ->expects($this->once())
@ -559,7 +559,7 @@ abstract class FetcherBase extends TestCase {
$response->method('getStatusCode') $response->method('getStatusCode')
->willReturn(304); ->willReturn(304);
$newData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}'; $newData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
$file $file
->expects($this->at(1)) ->expects($this->at(1))
->method('putContent') ->method('putContent')
@ -638,7 +638,7 @@ abstract class FetcherBase extends TestCase {
$response->method('getHeader') $response->method('getHeader')
->with($this->equalTo('ETag')) ->with($this->equalTo('ETag'))
->willReturn('"newETag"'); ->willReturn('"newETag"');
$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"newETag\""}'; $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"newETag\""}';
$file $file
->expects($this->at(1)) ->expects($this->at(1))
->method('putContent') ->method('putContent')
@ -650,11 +650,11 @@ abstract class FetcherBase extends TestCase {
$this->timeFactory $this->timeFactory
->expects($this->at(0)) ->expects($this->at(0))
->method('getTime') ->method('getTime')
->willReturn(1501); ->willReturn(4801);
$this->timeFactory $this->timeFactory
->expects($this->at(1)) ->expects($this->at(1))
->method('getTime') ->method('getTime')
->willReturn(1502); ->willReturn(4802);
$expected = [ $expected = [
[ [