Merge pull request #5794 from annando/ap1

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

diff --git a/src/Core/Cache/MemcacheCacheDriver.php b/src/Core/Cache/MemcacheCacheDriver.php
index 0b1ca3cec960bc6bfc526eaecdbe35dc2583b1a9..4ca5aa38db066c3ed35c2a0b5ac132eeb8f30620 100644 (file)
--- a/src/Core/Cache/MemcacheCacheDriver.php
+++ b/src/Core/Cache/MemcacheCacheDriver.php
@@ -2,34 +2,36 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 
+use Exception;
+use Memcache;
+
 /**
  * Memcache Cache Driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
+class MemcacheCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
        use TraitCompareSet;
        use TraitCompareDelete;
 
        /**
-        * @var \Memcache
+        * @var Memcache
         */
        private $memcache;
 
        public function __construct($memcache_host, $memcache_port)
        {
                if (!class_exists('Memcache', false)) {
-                       throw new \Exception('Memcache class isn\'t available');
+                       throw new Exception('Memcache class isn\'t available');
                }
 
-               $this->memcache = new \Memcache();
+               $this->memcache = new Memcache();
 
                if (!$this->memcache->connect($memcache_host, $memcache_port)) {
-                       throw new \Exception('Expected Memcache server at ' . $memcache_host . ':' . $memcache_port . ' isn\'t available');
+                       throw new Exception('Expected Memcache server at ' . $memcache_host . ':' . $memcache_port . ' isn\'t available');
                }
        }
 
@@ -39,9 +41,10 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
        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->memcache->get(self::getApp()->get_hostname() . ':' . $key);
+               $cached = $this->memcache->get($cachekey);
 
                // @see http://php.net/manual/en/memcache.get.php#84275
                if (is_bool($cached) || is_double($cached) || is_long($cached)) {
@@ -65,17 +68,19 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        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
                if ($ttl > 0) {
                        return $this->memcache->set(
-                               self::getApp()->get_hostname() . ":" . $key,
+                               $cachekey,
                                serialize($value),
                                MEMCACHE_COMPRESSED,
                                time() + $ttl
                        );
                } else {
                        return $this->memcache->set(
-                               self::getApp()->get_hostname() . ":" . $key,
+                               $cachekey,
                                serialize($value),
                                MEMCACHE_COMPRESSED
                        );
@@ -87,12 +92,20 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function delete($key)
        {
-               return $this->memcache->delete($key);
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcache->delete($cachekey);
        }
 
-       public function clear()
+       /**
+        * (@inheritdoc)
+        */
+       public function clear($outdated = true)
        {
-               return $this->memcache->flush();
+               if ($outdated) {
+                       return true;
+               } else {
+                       return $this->memcache->flush();
+               }
        }
 
        /**
@@ -100,6 +113,7 @@ class MemcacheCacheDriver extends BaseObject implements IMemoryCacheDriver
         */
        public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
-               return $this->memcache->add(self::getApp()->get_hostname() . ":" . $key, $value, $ttl);
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcache->add($cachekey, serialize($value), MEMCACHE_COMPRESSED, $ttl);
        }
 }