diff --git a/lib/private/Memcache/Factory.php b/lib/private/Memcache/Factory.php index cb2cd8aabe267695a21b83433bd58c50b1fe0e2e..8678c1b79998a086e5edbedc658961c8d6f375a1 100644 --- a/lib/private/Memcache/Factory.php +++ b/lib/private/Memcache/Factory.php @@ -185,11 +185,11 @@ class Factory implements ICacheFactory { } /** - * check local memcache availability + * Check if a local memory cache backend is available * * @return bool */ - public function isAvailableLowLatency(): bool { + public function isLocalCacheAvailable(): bool { return ($this->localCacheClass !== self::NULL_CACHE); } } diff --git a/lib/private/Server.php b/lib/private/Server.php index af739c91b02046799dfb719d4f09b244aa6ddfc4..b404af5613ddebf013d9073a10712e6be3f449f8 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -567,7 +567,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService(\OCP\Route\IRouter::class, function (Server $c) { $cacheFactory = $c->getMemCacheFactory(); $logger = $c->getLogger(); - if ($cacheFactory->isAvailableLowLatency()) { + if ($cacheFactory->isLocalCacheAvailable()) { $router = new \OC\Route\CachingRouter($cacheFactory->createLocal('route'), $logger); } else { $router = new \OC\Route\Router($logger); @@ -581,7 +581,7 @@ class Server extends ServerContainer implements IServerContainer { }); $this->registerAlias('Search', \OCP\ISearch::class); - $this->registerService(\OC\Security\RateLimiting\Limiter::class, function ($c) { + $this->registerService(\OC\Security\RateLimiting\Limiter::class, function (Server $c) { return new \OC\Security\RateLimiting\Limiter( $this->getUserSession(), $this->getRequest(), diff --git a/lib/public/ICacheFactory.php b/lib/public/ICacheFactory.php index 76145fe1f78840288fbd2b25e723f5ac61dbb12d..a078543b0929a5d29c3442f4538990578115b69f 100644 --- a/lib/public/ICacheFactory.php +++ b/lib/public/ICacheFactory.php @@ -51,6 +51,14 @@ interface ICacheFactory{ */ public function isAvailable(): bool; + /** + * Check if a local memory cache backend is available + * + * @return bool + * @since 14.0.0 + */ + public function isLocalCacheAvailable(): bool; + /** * create a cache instance for storing locks *