Merge pull request #5899 from annando/avoid-flooding

[friendica.git] / src / Core / Cache / RedisCacheDriver.php

diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index 8f85e67d7863ae55bb8fd7bba5e4caa947d113cf..fcbfab548a6b2bfba0e74e150a7d7b5f505dd9e1 100644 (file)
--- a/src/Core/Cache/RedisCacheDriver.php
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -4,46 +4,70 @@ namespace Friendica\Core\Cache;
 
 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 AbstractCacheDriver
+class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
        /**
-        * @var \Redis
+        * @var Redis
         */
        private $redis;
 
+       /**
+        * @param string $redis_host
+        * @param int    $redis_port
+        * @throws Exception
+        */
        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');
+               }
+       }
+
+       /**
+        * (@inheritdoc)
+        */
+       public function getAllKeys($prefix = null)
+       {
+               if (empty($prefix)) {
+                       $search = '*';
+               } else {
+                       $search = $prefix . '*';
                }
+
+               $list = $this->redis->keys($this->getCacheKey($search));
+
+               return $this->getOriginalKeys($list);
        }
 
+       /**
+        * (@inheritdoc)
+        */
        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($cachekey);
-
-               // @see http://php.net/manual/en/redis.get.php#84275
-               if (is_bool($cached) || is_double($cached) || is_long($cached)) {
-                       return $return;
+               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
@@ -55,48 +79,59 @@ class RedisCacheDriver extends AbstractCacheDriver
                return $return;
        }
 
+       /**
+        * (@inheritdoc)
+        */
        public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
                $cachekey = $this->getCacheKey($key);
 
-               // We store with the hostname as key to avoid problems with other applications
+               $cached = serialize($value);
+
                if ($ttl > 0) {
                        return $this->redis->setex(
                                $cachekey,
-                               time() + $ttl,
-                               serialize($value)
+                               $ttl,
+                               $cached
                        );
                } else {
                        return $this->redis->set(
                                $cachekey,
-                               serialize($value)
+                               $cached
                        );
                }
        }
 
+       /**
+        * (@inheritdoc)
+        */
        public function delete($key)
        {
-               return $this->redis->delete($key);
+               $cachekey = $this->getCacheKey($key);
+               return ($this->redis->delete($cachekey) > 0);
        }
 
-       public function clear()
+       /**
+        * (@inheritdoc)
+        */
+       public function clear($outdated = true)
        {
-               return true;
+               if ($outdated) {
+                       return true;
+               } else {
+                       return $this->redis->flushAll();
+               }
        }
 
-
        /**
         * (@inheritdoc)
         */
        public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
                $cachekey = $this->getCacheKey($key);
+               $cached = serialize($value);
 
-               if (!is_int($value)) {
-                       $value = serialize($value);
-               }
-
-               return $this->redis->setnx($cachekey, $value);
+               return $this->redis->setnx($cachekey, $cached);
        }
 
        /**
@@ -106,16 +141,14 @@ class RedisCacheDriver extends AbstractCacheDriver
        {
                $cachekey = $this->getCacheKey($key);
 
-               if (!is_int($newValue)) {
-                       $newValue = serialize($newValue);
-               }
+               $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($cachekey) === $oldValue) {
+               if ($this->get($key) === $oldValue) {
                        if ($ttl > 0) {
                                $result = $this->redis->multi()
-                                       ->setex($cachekey, $ttl, $newValue)
+                                       ->setex($cachekey, $ttl, $newCached)
                                        ->exec();
                        } else {
                                $result = $this->redis->multi()
@@ -127,6 +160,7 @@ class RedisCacheDriver extends AbstractCacheDriver
                $this->redis->unwatch();
                return false;
        }
+
        /**
         * (@inheritdoc)
         */