Merge pull request #8806 from nextcloud/add-local-memcache-check
Properly provide local memcache check to ICacheFactory
This commit is contained in:
commit
76d23a1600
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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(),
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue