Merge pull request #7678 from annando/remote-rework

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

diff --git a/src/Core/Cache/MemcacheCache.php b/src/Core/Cache/MemcacheCache.php
index b5b835f48812117c18ded24c6414e2547b172d55..6797a70c2b9a919ae40b73b86f5d390a312a8fce 100644 (file)
--- a/src/Core/Cache/MemcacheCache.php
+++ b/src/Core/Cache/MemcacheCache.php
@@ -3,7 +3,6 @@
 namespace Friendica\Core\Cache;
 
 use Exception;
-use Friendica\Core\Cache;
 use Friendica\Core\Config\Configuration;
 use Memcache;
 
@@ -12,10 +11,11 @@ use Memcache;
  *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class MemcacheCache extends AbstractCache implements IMemoryCache
+class MemcacheCache extends Cache implements IMemoryCache
 {
        use TraitCompareSet;
        use TraitCompareDelete;
+       use TraitMemcacheCommand;
 
        /**
         * @var Memcache
@@ -35,11 +35,11 @@ class MemcacheCache extends AbstractCache implements IMemoryCache
 
                $this->memcache = new Memcache();
 
-               $memcache_host = $config->get('system', 'memcache_host');
-               $memcache_port = $config->get('system', 'memcache_port');
+               $this->server = $config->get('system', 'memcache_host');;
+               $this->port = $config->get('system', 'memcache_port');
 
-               if (!$this->memcache->connect($memcache_host, $memcache_port)) {
-                       throw new Exception('Expected Memcache server at ' . $memcache_host . ':' . $memcache_port . ' isn\'t available');
+               if (!@$this->memcache->connect($this->server, $this->port)) {
+                       throw new Exception('Expected Memcache server at ' . $this->server . ':' . $this->port . ' isn\'t available');
                }
        }
 
@@ -48,21 +48,7 @@ class MemcacheCache extends AbstractCache implements IMemoryCache
         */
        public function getAllKeys($prefix = null)
        {
-               $keys = [];
-               $allSlabs = $this->memcache->getExtendedStats('slabs');
-               foreach ($allSlabs as $slabs) {
-                       foreach (array_keys($slabs) as $slabId) {
-                               $cachedump = $this->memcache->getExtendedStats('cachedump', (int)$slabId);
-                               foreach ($cachedump as $key => $arrVal) {
-                                       if (!is_array($arrVal)) {
-                                               continue;
-                                       }
-                                       $keys = array_merge($keys, array_keys($arrVal));
-                               }
-                       }
-               }
-
-               $keys = $this->getOriginalKeys($keys);
+               $keys = $this->getOriginalKeys($this->getMemcacheKeys());
 
                return $this->filterArrayKeysByPrefix($keys, $prefix);
        }
@@ -72,7 +58,7 @@ class MemcacheCache extends AbstractCache implements IMemoryCache
         */
        public function get($key)
        {
-               $return = null;
+               $return   = null;
                $cachekey = $this->getCacheKey($key);
 
                // We fetch with the hostname as key to avoid problems with other applications
@@ -148,4 +134,12 @@ class MemcacheCache extends AbstractCache implements IMemoryCache
                $cachekey = $this->getCacheKey($key);
                return $this->memcache->add($cachekey, serialize($value), MEMCACHE_COMPRESSED, $ttl);
        }
+
+       /**
+        * {@inheritDoc}
+        */
+       public function getName()
+       {
+               return self::TYPE_MEMCACHE;
+       }
 }