X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FCache%2FRedisCacheDriver.php;h=2c2a3e5d7cb27a99bc896f8816f8ed5571efc475;hb=8dc5b04be7cd9cb2eb77ed9824815efe27369bee;hp=d23fa2697bfe9b2398a4fdd5d29e780b4c732a28;hpb=aac94d1d7445f2287f89a3559f4b3988e39edbdb;p=friendica.git

diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index d23fa2697b..2c2a3e5d7c 100644
--- a/src/Core/Cache/RedisCacheDriver.php
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -2,16 +2,18 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 
+use Exception;
+use Redis;
+
 /**
  * Redis Cache Driver. This driver is based on Memcache driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  * @author Roland Haeder <roland@mxchange.org>
  */
-class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
+class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
 	/**
 	 * @var Redis
@@ -21,29 +23,27 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
 	public function __construct($redis_host, $redis_port)
 	{
 		if (!class_exists('Redis', false)) {
-			throw new \Exception('Redis class isn\'t available');
+			throw new Exception('Redis class isn\'t available');
 		}
 
-		$this->redis = new \Redis();
+		$this->redis = new Redis();
 
 		if (!$this->redis->connect($redis_host, $redis_port)) {
-			throw new \Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
+			throw new Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
 		}
 	}
 
 	public function get($key)
 	{
 		$return = null;
+		$cachekey = $this->getCacheKey($key);
 
-		// We fetch with the hostname as key to avoid problems with other applications
-		$cached = $this->redis->get(self::getApp()->get_hostname() . ':' . $key);
-
-		// @see http://php.net/manual/en/redis.get.php#84275
-		if (is_bool($cached) || is_double($cached) || is_long($cached)) {
-			return $return;
+		$cached = $this->redis->get($cachekey);
+		if ($cached === false && !$this->redis->exists($cachekey)) {
+			return null;
 		}
 
-		$value = @unserialize($cached);
+		$value = unserialize($cached);
 
 		// Only return a value if the serialized value is valid.
 		// We also check if the db entry is a serialized
@@ -57,74 +57,69 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
 
 	public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
 	{
-		// We store with the hostname as key to avoid problems with other applications
+		$cachekey = $this->getCacheKey($key);
+
+		$cached = serialize($value);
+
 		if ($ttl > 0) {
 			return $this->redis->setex(
-				self::getApp()->get_hostname() . ":" . $key,
-				time() + $ttl,
-				serialize($value)
+				$cachekey,
+				$ttl,
+				$cached
 			);
 		} else {
 			return $this->redis->set(
-				self::getApp()->get_hostname() . ":" . $key,
-				serialize($value)
+				$cachekey,
+				$cached
 			);
 		}
 	}
 
 	public function delete($key)
 	{
-		return $this->redis->delete($key);
+		$cachekey = $this->getCacheKey($key);
+		return ($this->redis->delete($cachekey) > 0);
 	}
 
-	public function clear()
+	public function clear($outdated = true)
 	{
-		return true;
+		if ($outdated) {
+			return true;
+		} else {
+			return $this->redis->flushAll();
+		}
 	}
 
-
 	/**
-	 * @brief Sets a value if it's not already stored
-	 *
-	 * @param string $key The cache key
-	 * @param mixed $value The old value we know from the cache
-	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
-	 * @return bool
+	 * (@inheritdoc)
 	 */
 	public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
 	{
-		if (!is_int($value)) {
-			$value = serialize($value);
-		}
+		$cachekey = $this->getCacheKey($key);
+		$cached = serialize($value);
 
-		return $this->redis->setnx(self::getApp()->get_hostname() . ":" . $key, $value);
+		return $this->redis->setnx($cachekey, $cached);
 	}
 
 	/**
-	 * @brief Compares if the old value is set and sets the new value
-	 *
-	 * @param string $key The cache key
-	 * @param mixed $oldValue The old value we know
-	 * @param mixed $newValue The new value we want to set
-	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
-	 * @return bool
+	 * (@inheritdoc)
 	 */
 	public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES)
 	{
-		if (!is_int($newValue)) {
-			$newValue = serialize($newValue);
-		}
+		$cachekey = $this->getCacheKey($key);
 
-		$this->redis->watch(self::getApp()->get_hostname() . ":" . $key);
+		$newCached = serialize($newValue);
+
+		$this->redis->watch($cachekey);
 		// If the old value isn't what we expected, somebody else changed the key meanwhile
 		if ($this->get($key) === $oldValue) {
 			if ($ttl > 0) {
 				$result = $this->redis->multi()
-					->setex(self::getApp()->get_hostname() . ":" . $ttl, $key, $newValue)
+					->setex($cachekey, $ttl, $newCached)
 					->exec();
 			} else {
 				$result = $this->redis->multi()
-					->set(self::getApp()->get_hostname() . ":" . $key, $newValue)
+					->set($cachekey, $newValue)
 					->exec();
 			}
 			return $result !== false;
@@ -133,19 +128,17 @@ class RedisCacheDriver extends BaseObject implements IMemoryCacheDriver
 		return false;
 	}
 	/**
-	 * @brief Compares if the old value is set and removes it
-	 *
-	 * @param string $key The cache key
-	 * @param mixed $value The old value we know and want to delete
-	 * @return bool
+	 * (@inheritdoc)
 	 */
 	public function compareDelete($key, $value)
 	{
-		$this->redis->watch(self::getApp()->get_hostname() . ":" . $key);
+		$cachekey = $this->getCacheKey($key);
+
+		$this->redis->watch($cachekey);
 		// If the old value isn't what we expected, somebody else changed the key meanwhile
 		if ($this->get($key) === $value) {
 			$result = $this->redis->multi()
-				->del(self::getApp()->get_hostname() . ":" . $key)
+				->del($cachekey)
 				->exec();
 			return $result !== false;
 		}