X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FCache.php;h=cc77d9bfd0dc7e35598130af672287454ffdd25c;hb=61693419e8cf571a2ad26690423d356023badc2e;hp=58969f0819f4a25498c20c518018e093d7fd5093;hpb=3628b62aebe187f49b5e3019ed74fa6e0dd815db;p=friendica.git

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index 58969f0819..cc77d9bfd0 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,85 +4,32 @@
  */
 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
  */
-class Cache
+class Cache extends \Friendica\BaseObject
 {
-	const MONTH        = 0;
-	const WEEK         = 1;
-	const DAY          = 2;
-	const HOUR         = 3;
-	const HALF_HOUR    = 4;
-	const QUARTER_HOUR = 5;
-	const FIVE_MINUTES = 6;
-	const MINUTE       = 7;
+	const MONTH        = 2592000;
+	const WEEK         = 604800;
+	const DAY          = 86400;
+	const HOUR         = 3600;
+	const HALF_HOUR    = 1800;
+	const QUARTER_HOUR = 900;
+	const FIVE_MINUTES = 300;
+	const MINUTE       = 60;
 
 	/**
 	 * @var Cache\ICacheDriver
 	 */
-	static $driver = null;
+	private static $driver = 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_host = Config::get('system', 'memcached_host', '127.0.0.1');
-				$memcached_port = Config::get('system', 'memcached_port', 11211);
-
-				self::$driver = new Cache\MemcachedCacheDriver($memcached_host, $memcached_port);
-				break;
-			default:
-				self::$driver = new Cache\DatabaseCacheDriver();
-		}
-	}
+		$driver_name = Config::get('system', 'cache_driver', 'database');
 
-	/**
-	 * @brief Return the duration for a given cache level
-	 *
-	 * @param integer $level Cache level
-	 *
-	 * @return integer The cache duration in seconds
-	 */
-	public static function duration($level)
-	{
-		switch ($level) {
-			case self::MONTH:
-				$seconds = 2592000;
-				break;
-			case self::WEEK:
-				$seconds = 604800;
-				break;
-			case self::DAY:
-				$seconds = 86400;
-				break;
-			case self::HOUR:
-				$seconds = 3600;
-				break;
-			case self::HALF_HOUR:
-				$seconds = 1800;
-				break;
-			case self::QUARTER_HOUR:
-				$seconds = 900;
-				break;
-			case self::FIVE_MINUTES:
-				$seconds = 300;
-				break;
-			case self::MINUTE:
-			default:
-				$seconds = 60;
-				break;
-		}
-		return $seconds;
+		self::$driver = CacheDriverFactory::create($driver_name);
 	}
 
 	/**
@@ -108,7 +55,13 @@ class Cache
 	 */
 	public static function get($key)
 	{
-		return self::getDriver()->get($key);
+		$time = microtime(true);
+
+		$return = self::getDriver()->get($key);
+
+		self::getApp()->save_timestamp($time, 'cache');
+
+		return $return;
 	}
 
 	/**
@@ -124,7 +77,31 @@ class Cache
 	 */
 	public static function set($key, $value, $duration = self::MONTH)
 	{
-		return self::getDriver()->set($key, $value, $duration);
+		$time = microtime(true);
+
+		$return = self::getDriver()->set($key, $value, $duration);
+
+		self::getApp()->save_timestamp($time, 'cache_write');
+
+		return $return;
+	}
+
+	/**
+	 * @brief Delete a value from the cache
+	 *
+	 * @param string $key The key to the cached data
+	 *
+	 * @return bool
+	 */
+	public static function delete($key)
+	{
+		$time = microtime(true);
+
+		$return = self::getDriver()->delete($key);
+
+		self::getApp()->save_timestamp($time, 'cache_write');
+
+		return $return;
 	}
 
 	/**