X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FCache.php;h=cadb2444b50e4debee4b9eff7a9f55d6e47f1d60;hb=9c12f3f226cefa64456c559fd060e067389d9886;hp=ea7807031fde7389479dfb2bad49c1d342094e2c;hpb=743e7d3ecb4bc06999284bffd977265abc23731f;p=friendica.git

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index ea7807031f..cadb2444b5 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -19,6 +19,7 @@ class Cache extends \Friendica\BaseObject
 	const QUARTER_HOUR = 900;
 	const FIVE_MINUTES = 300;
 	const MINUTE       = 60;
+	const INFINITE     = 0;
 
 	/**
 	 * @var Cache\ICacheDriver
@@ -51,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;
 	}
@@ -77,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)
 	{
@@ -84,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;
 	}
@@ -99,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)
 	{
@@ -106,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;
 	}
@@ -117,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)
 	{
@@ -124,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;
 	}
@@ -134,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)
 	{