X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FCache.php;h=7a8f7367ec10597613b7ed94385bfdf85c2464f0;hb=79e69ee52807967858f5cb89e702be035f979ba5;hp=68537c5249c955597d1ce3026e0865d4792a389c;hpb=71c08a044f8317c92b3b282a70f55406ae9deb0a;p=friendica.git

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index 68537c5249..7a8f7367ec 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,7 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 
 /**
  * @brief Class for storing data for a short time
@@ -19,17 +19,20 @@ class Cache extends \Friendica\BaseObject
 	const QUARTER_HOUR = 900;
 	const FIVE_MINUTES = 300;
 	const MINUTE       = 60;
+	const INFINITE     = 0;
 
 	/**
 	 * @var Cache\ICacheDriver
 	 */
-	private static $driver = null;
+	private static $driver       = null;
+	public  static $driver_class = null;
+	public  static $driver_name  = null;
 
 	public static function init()
 	{
-		$driver_name = Config::get('system', 'cache_driver', 'database');
-
-		self::$driver = CacheDriverFactory::create($driver_name);
+		self::$driver_name  = Config::get('system', 'cache_driver', 'database');
+		self::$driver       = CacheDriverFactory::create(self::$driver_name);
+		self::$driver_class = get_class(self::$driver);
 	}
 
 	/**
@@ -49,22 +52,18 @@ class Cache extends \Friendica\BaseObject
 	/**
 	 * @brief Returns all the cache keys sorted alphabetically
 	 *
-	 * @return array|null Null if the driver doesn't support this feature
+	 * @param string $prefix Prefix of the keys (optional)
+	 *
+	 * @return array Empty if the driver doesn't support this feature
+	 * @throws \Exception
 	 */
-	public static function getAllKeys()
+	public static function getAllKeys($prefix = null)
 	{
 		$time = microtime(true);
 
-		$return = self::getDriver()->getAllKeys();
-
-		// Keys are prefixed with the node hostname, let's remove it
-		array_walk($return, function (&$value) {
-			$value = preg_replace('/^' . self::getApp()->get_hostname() . ':/', '', $value);
-		});
+		$return = self::getDriver()->getAllKeys($prefix);
 
-		sort($return);
-
-		self::getApp()->save_timestamp($time, 'cache');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache', System::callstack());
 
 		return $return;
 	}
@@ -75,6 +74,7 @@ class Cache extends \Friendica\BaseObject
 	 * @param string $key The key to the cached data
 	 *
 	 * @return mixed Cached $value or "null" if not found
+	 * @throws \Exception
 	 */
 	public static function get($key)
 	{
@@ -82,7 +82,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->get($key);
 
-		self::getApp()->save_timestamp($time, 'cache');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache', System::callstack());
 
 		return $return;
 	}
@@ -97,6 +97,7 @@ class Cache extends \Friendica\BaseObject
 	 * @param integer $duration The cache lifespan
 	 *
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function set($key, $value, $duration = self::MONTH)
 	{
@@ -104,7 +105,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->set($key, $value, $duration);
 
-		self::getApp()->save_timestamp($time, 'cache_write');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write', System::callstack());
 
 		return $return;
 	}
@@ -115,6 +116,7 @@ class Cache extends \Friendica\BaseObject
 	 * @param string $key The key to the cached data
 	 *
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function delete($key)
 	{
@@ -122,7 +124,7 @@ class Cache extends \Friendica\BaseObject
 
 		$return = self::getDriver()->delete($key);
 
-		self::getApp()->save_timestamp($time, 'cache_write');
+		self::getApp()->getProfiler()->saveTimestamp($time, 'cache_write', System::callstack());
 
 		return $return;
 	}
@@ -132,7 +134,7 @@ class Cache extends \Friendica\BaseObject
 	 *
 	 * @param boolean $outdated just remove outdated values
 	 *
-	 * @return void
+	 * @return bool
 	 */
 	public static function clear($outdated = true)
 	{