Merge pull request #336 from wikimedia/ttl-env

Change api cache ttl to be a .evn var
wikimedia · Feb 26, 2021 · 00f4548 · 00f4548
2 parents 53ce0af + 3e589b2
commit 00f4548
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.env b/.env
@@ -35,6 +35,7 @@ MAILER_DSN=smtp://mail.tools.wmflabs.org:25
 # APP_TEMP_PATH=/tmp/wsexport
 APP_ENABLE_STATS=true
 APP_ENABLE_CACHE=false
+APP_CACHE_TTL=21600
 APP_TIMEOUT=120
 APP_MAIL_SENDER=tools.wsexport@tools.wmflabs.org
 APP_LOG_RECIPIENT_1=admin1@example.org

diff --git a/config/services.yaml b/config/services.yaml
@@ -50,5 +50,9 @@ services:
             $epubCheckPath: '%env(string:EPUBCHECK_JAR)%'
         public: true
 
+    App\Util\Api:
+        arguments:
+            $cacheTtl: '%env(int:APP_CACHE_TTL)%'
+
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
diff --git a/src/Util/Api.php b/src/Util/Api.php
@@ -49,11 +49,12 @@ class Api {
 	/** @var string[][] */
 	private $namespaces = [];
 
-	public function __construct( LoggerInterface $logger, CacheItemPoolInterface $cacheItemPool, CacheInterface $cache, ClientInterface $client = null ) {
+	public function __construct( LoggerInterface $logger, CacheItemPoolInterface $cacheItemPool, CacheInterface $cache, ?ClientInterface $client, int $cacheTtl ) {
 		$this->logger = $logger;
 		$this->cache = $cache;
+
 		if ( $client === null ) {
-			$client = $this->createClient( $logger, $cacheItemPool );
+			$client = $this->createClient( $logger, $cacheItemPool, $cacheTtl );
 		}
 		$this->client = $client;
 	}
@@ -302,17 +303,18 @@ public function get( $url ) {
 
 	/**
 	 * @param LoggerInterface $logger
+	 * @param CacheItemPoolInterface $cache
+	 * @param int $cacheTtl
 	 * @return ClientInterface
 	 */
-	private function createClient( LoggerInterface $logger, CacheItemPoolInterface $cache ): ClientInterface {
+	private function createClient( LoggerInterface $logger, CacheItemPoolInterface $cache, int $cacheTtl ): ClientInterface {
 		$handler = HandlerStack::create();
 
 		// Logger.
 		$handler->push( LoggingMiddleware::forLogger( $logger ), 'logging' );
 
 		// Cache.
-		$ttl = 12 * 60 * 60;
-		$cacheStrategy = new GreedyCacheStrategy( new Psr6CacheStorage( $cache ), $ttl );
+		$cacheStrategy = new GreedyCacheStrategy( new Psr6CacheStorage( $cache ), $cacheTtl );
 		$handler->push( new CacheMiddleware( $cacheStrategy ), 'cache' );
 
 		return new Client( [

diff --git a/tests/Book/BookProviderTest.php b/tests/Book/BookProviderTest.php
@@ -38,7 +38,7 @@ public function setUp(): void {
 		];
 		$this->mockHandler = new MockHandler( $responses );
 		$client = new Client( [ 'handler' => HandlerStack::create( $this->mockHandler ) ] );
-		$api = new Api( new NullLogger(), new NullAdapter(), new NullAdapter(), $client );
+		$api = new Api( new NullLogger(), new NullAdapter(), new NullAdapter(), $client, 0 );
 		$api->setLang( 'en' );
 		$this->bookProvider = new BookProvider( $api, [ 'categories' => false, 'credits' => true ] );
 	}

diff --git a/tests/Book/RefreshTest.php b/tests/Book/RefreshTest.php
@@ -43,7 +43,7 @@ public function testRefreshUpdatesEpubCssWikisource() {
 	}
 
 	private function refresh( $lang ) {
-		$api = new Api( new NullLogger(), new NullAdapter(), new NullAdapter(), $this->mockClient( $this->defaultResponses() ) );
+		$api = new Api( new NullLogger(), new NullAdapter(), new NullAdapter(), $this->mockClient( $this->defaultResponses() ), 0 );
 		$api->setLang( $lang );
 		$refresh = new Refresh( $api, new NullAdapter() );
 		$refresh->refresh();

diff --git a/tests/Util/ApiTest.php b/tests/Util/ApiTest.php
@@ -42,7 +42,7 @@ private function apiWithJsonResponse( $data ) {
 	}
 
 	private function apiWithResponse( $status, $header, $body ) {
-		$api = new Api( new NullLogger(), new NullAdapter(), new NullAdapter(), $this->mockClient( [ new Response( $status, $header, $body ) ] ) );
+		$api = new Api( new NullLogger(), new NullAdapter(), new NullAdapter(), $this->mockClient( [ new Response( $status, $header, $body ) ] ), 60 );
 		$api->setLang( 'en' );
 		return $api;
 	}