From 1ba6d52141ff5a075134b3f52fff7bc95b330286 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 2 Sep 2016 15:59:52 -0700 Subject: [PATCH] Use WAN cache adaptiveTTL() method in FileBackendStore Change-Id: I2e8b4e85b12c8892e8640abc63ee13b4b170645d --- includes/filebackend/FileBackendStore.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php index a29119c9cf..db6575e198 100644 --- a/includes/filebackend/FileBackendStore.php +++ b/includes/filebackend/FileBackendStore.php @@ -1702,8 +1702,8 @@ abstract class FileBackendStore extends FileBackend { if ( $path === null ) { return; // invalid storage path } - $age = time() - wfTimestamp( TS_UNIX, $val['mtime'] ); - $ttl = min( 7 * 86400, max( 300, floor( .1 * $age ) ) ); + $mtime = wfTimestamp( TS_UNIX, $val['mtime'] ); + $ttl = $this->memCache->adaptiveTTL( $mtime, 7 * 86400, 300, .1 ); $key = $this->fileCacheKey( $path ); // Set the cache unless it is currently salted. $this->memCache->set( $key, $val, $ttl ); -- 2.20.1