feat: add filecache config to enable/disable real purge (#3263)

* refactor: cachefactory

* feat: add filecache config to enable/disable real purge

* test: fix test
This commit is contained in:
Dag 2023-03-06 21:50:40 +01:00 committed by GitHub
parent 007f2b2d8a
commit 058e792b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 12 deletions

View File

@ -2,11 +2,13 @@
class FileCache implements CacheInterface class FileCache implements CacheInterface
{ {
private array $config;
protected $path; protected $path;
protected $key; protected $key;
public function __construct() public function __construct(array $config = [])
{ {
$this->config = $config;
if (!is_writable(PATH_CACHE)) { if (!is_writable(PATH_CACHE)) {
throw new \Exception('The cache folder is not writeable'); throw new \Exception('The cache folder is not writeable');
} }
@ -46,6 +48,10 @@ class FileCache implements CacheInterface
public function purgeCache($seconds) public function purgeCache($seconds)
{ {
if (! $this->config['enable_purge']) {
return;
}
$cachePath = $this->getPath(); $cachePath = $this->getPath();
if (!file_exists($cachePath)) { if (!file_exists($cachePath)) {
return; return;

View File

@ -95,6 +95,10 @@ report_limit = 1
; --- Cache specific configuration --------------------------------------------- ; --- Cache specific configuration ---------------------------------------------
[FileCache]
; Whether to actually delete files when purging. Can be useful to turn off to increase performance.
enable_purge = true
[SQLiteCache] [SQLiteCache]
file = "cache.sqlite" file = "cache.sqlite"

View File

@ -24,19 +24,32 @@ class CacheFactory
if (preg_match('/(.+)(?:Cache)$/i', $name, $matches)) { if (preg_match('/(.+)(?:Cache)$/i', $name, $matches)) {
$name = $matches[1]; $name = $matches[1];
} }
if (in_array(strtolower($name), array_map('strtolower', $cacheNames))) {
$index = array_search(strtolower($name), array_map('strtolower', $cacheNames)); $index = array_search(strtolower($name), array_map('strtolower', $cacheNames));
$name = $cacheNames[$index]; if ($index === false) {
} else {
throw new \InvalidArgumentException(sprintf('Invalid cache name: "%s"', $name)); throw new \InvalidArgumentException(sprintf('Invalid cache name: "%s"', $name));
} }
if (! preg_match('/^[A-Z][a-zA-Z0-9-]*$/', $name)) { $className = $cacheNames[$index] . 'Cache';
throw new \InvalidArgumentException(sprintf('Invalid cache name: "%s"', $name)); if (!preg_match('/^[A-Z][a-zA-Z0-9-]*$/', $className)) {
throw new \InvalidArgumentException(sprintf('Invalid cache classname: "%s"', $className));
} }
$className = $name . 'Cache';
switch ($className) {
case NullCache::class:
return new NullCache();
case FileCache::class:
return new FileCache([
'enable_purge' => Configuration::getConfig('FileCache', 'enable_purge'),
]);
case SQLiteCache::class:
return new SQLiteCache();
case MemcachedCache::class:
return new MemcachedCache();
default:
if (!file_exists(PATH_LIB_CACHES . $className . '.php')) { if (!file_exists(PATH_LIB_CACHES . $className . '.php')) {
throw new \Exception('Unable to find the cache file'); throw new \Exception('Unable to find the cache file');
} }
return new $className(); return new $className();
} }
} }
}

View File

@ -28,7 +28,7 @@ final class UtilsTest extends TestCase
public function testFileCache() public function testFileCache()
{ {
$sut = new \FileCache(); $sut = new \FileCache(['enable_purge' => true]);
$sut->setScope('scope'); $sut->setScope('scope');
$sut->purgeCache(-1); $sut->purgeCache(-1);
$sut->setKey(['key']); $sut->setKey(['key']);