X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FCache.php;h=e7277fd702cac3e30520d5c9aa4e91677b953f6a;hb=795268eb7ad3f10b08721f5d006f22a91bb5c9b6;hp=f1d1e11a542a26835b0700e25221fd36493ef044;hpb=c9f02d534e2016acf18d7fa18db193d056495841;p=friendica.git

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index f1d1e11a54..e7277fd702 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,8 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\CacheDriverFactory;
 
 /**
  * @brief Class for storing data for a short time
@@ -20,29 +19,20 @@ class Cache extends \Friendica\BaseObject
 	const QUARTER_HOUR = 900;
 	const FIVE_MINUTES = 300;
 	const MINUTE       = 60;
+	const INFINITE     = 0;
 
 	/**
 	 * @var Cache\ICacheDriver
 	 */
-	static $driver = null;
+	private static $driver       = null;
+	public  static $driver_class = null;
+	public  static $driver_name  = null;
 
 	public static function init()
 	{
-		switch(Config::get('system', 'cache_driver', 'database')) {
-			case 'memcache':
-				$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
-				$memcache_port = Config::get('system', 'memcache_port', 11211);
-
-				self::$driver = new Cache\MemcacheCacheDriver($memcache_host, $memcache_port);
-				break;
-			case 'memcached':
-				$memcached_hosts = Config::get('system', 'memcached_hosts', [['127.0.0.1', 11211]]);
-
-				self::$driver = new Cache\MemcachedCacheDriver($memcached_hosts);
-				break;
-			default:
-				self::$driver = new Cache\DatabaseCacheDriver();
-		}
+		self::$driver_name  = Config::get('system', 'cache_driver', 'database');
+		self::$driver       = CacheDriverFactory::create(self::$driver_name);
+		self::$driver_class = get_class(self::$driver);
 	}
 
 	/**
@@ -59,6 +49,24 @@ class Cache extends \Friendica\BaseObject
 		return self::$driver;
 	}
 
+	/**
+	 * @brief Returns all the cache keys sorted alphabetically
+	 *
+	 * @param string $prefix Prefix of the keys (optional)
+	 *
+	 * @return array Empty if the driver doesn't support this feature
+	 */
+	public static function getAllKeys($prefix = null)
+	{
+		$time = microtime(true);
+
+		$return = self::getDriver()->getAllKeys($prefix);
+
+		self::getApp()->saveTimestamp($time, 'cache');
+
+		return $return;
+	}
+
 	/**
 	 * @brief Fetch cached data according to the key
 	 *
@@ -72,7 +80,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->get($key);
 
-		self::getApp()->save_timestamp($time, 'cache');
+		self::getApp()->saveTimestamp($time, 'cache');
 
 		return $return;
 	}
@@ -94,7 +102,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->set($key, $value, $duration);
 
-		self::getApp()->save_timestamp($time, 'cache_write');
+		self::getApp()->saveTimestamp($time, 'cache_write');
 
 		return $return;
 	}
@@ -112,7 +120,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->delete($key);
 
-		self::getApp()->save_timestamp($time, 'cache_write');
+		self::getApp()->saveTimestamp($time, 'cache_write');
 
 		return $return;
 	}
@@ -120,12 +128,12 @@ class Cache extends \Friendica\BaseObject
 	/**
 	 * @brief Remove outdated data from the cache
 	 *
-	 * @param integer $max_level The maximum cache level that is to be cleared
+	 * @param boolean $outdated just remove outdated values
 	 *
 	 * @return void
 	 */
-	public static function clear()
+	public static function clear($outdated = true)
 	{
-		return self::getDriver()->clear();
+		return self::getDriver()->clear($outdated);
 	}
 }