Merge branch 'bug/phpinfo-accessible-hotfix' into develop

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

diff --git a/src/Core/Cache/MemcachedCache.php b/src/Core/Cache/MemcachedCache.php
index ac0648a6ceeed06ff0ea702261cf1c37ce77c58e..d8fcbc770d428e1e68126f11e3493d9b82c2d23a 100644 (file)
--- a/src/Core/Cache/MemcachedCache.php
+++ b/src/Core/Cache/MemcachedCache.php
@@ -1,21 +1,40 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Core\Cache;
 
 use Exception;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\BaseCache;
+use Friendica\Core\Config\IConfig;
 use Memcached;
 use Psr\Log\LoggerInterface;
 
 /**
  * Memcached Cache
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class MemcachedCache extends Cache implements IMemoryCache
+class MemcachedCache extends BaseCache implements IMemoryCache
 {
        use TraitCompareSet;
        use TraitCompareDelete;
+       use TraitMemcacheCommand;
 
        /**
         * @var \Memcached
@@ -38,7 +57,7 @@ class MemcachedCache extends Cache implements IMemoryCache
         *
         * @throws \Exception
         */
-       public function __construct(string $hostname, Configuration $config, LoggerInterface $logger)
+       public function __construct(string $hostname, IConfig $config, LoggerInterface $logger)
        {
                if (!class_exists('Memcached', false)) {
                        throw new Exception('Memcached class isn\'t available');
@@ -58,6 +77,9 @@ class MemcachedCache extends Cache implements IMemoryCache
                        }
                });
 
+               $this->server = $memcached_hosts[0][0] ?? 'localhost';
+               $this->port = $memcached_hosts[0][1] ?? 11211;
+
                $this->memcached->addServers($memcached_hosts);
 
                if (count($this->memcached->getServerList()) == 0) {
@@ -70,14 +92,9 @@ class MemcachedCache extends Cache implements IMemoryCache
         */
        public function getAllKeys($prefix = null)
        {
-               $keys = $this->getOriginalKeys($this->memcached->getAllKeys());
+               $keys = $this->getOriginalKeys($this->getMemcacheKeys());
 
-               if ($this->memcached->getResultCode() == Memcached::RES_SUCCESS) {
-                       return $this->filterArrayKeysByPrefix($keys, $prefix);
-               } else {
-                       $this->logger->debug('Memcached \'getAllKeys\' failed', ['result' => $this->memcached->getResultMessage()]);
-                       return [];
-               }
+               return $this->filterArrayKeysByPrefix($keys, $prefix);
        }
 
        /**
@@ -103,7 +120,7 @@ class MemcachedCache extends Cache implements IMemoryCache
        /**
         * (@inheritdoc)
         */
-       public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
+       public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
        {
                $cachekey = $this->getCacheKey($key);
 
@@ -146,7 +163,7 @@ class MemcachedCache extends Cache implements IMemoryCache
        /**
         * (@inheritdoc)
         */
-       public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
+       public function add($key, $value, $ttl = Duration::FIVE_MINUTES)
        {
                $cachekey = $this->getCacheKey($key);
                return $this->memcached->add($cachekey, $value, $ttl);
@@ -157,6 +174,6 @@ class MemcachedCache extends Cache implements IMemoryCache
         */
        public function getName()
        {
-               return self::TYPE_MEMCACHED;
+               return Type::MEMCACHED;
        }
 }