sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cache appstore requests for 60 instead of 5 minutes 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
pull/21056/head
Morris Jobke 2020-05-19 23:04:25 +07:00
parent ac9c0ea10d
commit daebc05171
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
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
Unescape Escape View File

@ -39,7 +39,7 @@ use OCP\ILogger;
use OCP\Util;
abstract class Fetcher {
const INVALIDATE_AFTER_SECONDS = 300;
const INVALIDATE_AFTER_SECONDS = 3600;
/** @var IAppData */
protected $appData;
@ -151,7 +151,7 @@ abstract class Fetcher {
// No caching when the version has been updated
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)) {
return $jsonBlob['data'];
}

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

@ -234,7 +234,7 @@ abstract class FetcherBase extends TestCase {
$this->timeFactory
->expects($this->at(0))
->method('getTime')
->willReturn(1501);
->willReturn(4801);
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
@ -518,11 +518,11 @@ abstract class FetcherBase extends TestCase {
$this->timeFactory
->expects($this->at(0))
->method('getTime')
->willReturn(1501);
->willReturn(4801);
$this->timeFactory
->expects($this->at(1))
->method('getTime')
->willReturn(1502);
->willReturn(4802);
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
@ -544,7 +544,7 @@ abstract class FetcherBase extends TestCase {
$response->method('getStatusCode')
->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
->expects($this->at(1))
->method('putContent')
@ -623,7 +623,7 @@ abstract class FetcherBase extends TestCase {
$response->method('getHeader')
->with($this->equalTo('ETag'))
->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
->expects($this->at(1))
->method('putContent')
@ -635,11 +635,11 @@ abstract class FetcherBase extends TestCase {
$this->timeFactory
->expects($this->at(0))
->method('getTime')
->willReturn(1501);
->willReturn(4801);
$this->timeFactory
->expects($this->at(1))
->method('getTime')
->willReturn(1502);
->willReturn(4802);
$expected = [
[