Jelajahi Sumber

Properly provide local memcache check to ICacheFactory

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke 6 tahun lalu
induk
melakukan
dde5353f98
3 mengubah file dengan 12 tambahan dan 4 penghapusan
  1. 2 2
      lib/private/Memcache/Factory.php
  2. 2 2
      lib/private/Server.php
  3. 8 0
      lib/public/ICacheFactory.php

+ 2 - 2
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);
 	}
 }

+ 2 - 2
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(),

+ 8 - 0
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
 	 *