Refactor namespaces

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

diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index a6e1bad950e343c3a0aef88ec37db65162f3ff25..687e67416acf3314c9d1655e5c63d2382e84cd86 100644 (file)
--- a/src/Core/Cache/MemcachedCacheDriver.php
+++ b/src/Core/Cache/MemcachedCacheDriver.php
@@ -3,9 +3,9 @@
 namespace Friendica\Core\Cache;
 
 use Friendica\Core\Cache;
+use Friendica\Core\Logger;
 
 use Exception;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 use Memcached;
 
 /**
@@ -41,9 +41,6 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
 
                $this->memcached = new Memcached();
 
-
-               $this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, false);
-
                array_walk($memcached_hosts, function (&$value) {
                        if (is_string($value)) {
                                $value = array_map('trim', explode(',', $value));
@@ -67,7 +64,7 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
                if ($this->memcached->getResultCode() == Memcached::RES_SUCCESS) {
                        return $this->filterArrayKeysByPrefix($keys, $prefix);
                } else {
-                       logger('Memcached \'getAllKeys\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
+                       Logger::log('Memcached \'getAllKeys\' failed with ' . $this->memcached->getResultMessage(), Logger::ALL);
                        return [];
                }
        }
@@ -77,17 +74,19 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
         */
        public function get($key)
        {
+               $return = null;
                $cachekey = $this->getCacheKey($key);
 
                // We fetch with the hostname as key to avoid problems with other applications
                $value = $this->memcached->get($cachekey);
 
                if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
-                       return $value;
+                       $return = $value;
                } else {
-                       logger('Memcached \'get\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
-                       return [];
+                       Logger::log('Memcached \'get\' failed with ' . $this->memcached->getResultMessage(), Logger::ALL);
                }
+
+               return $return;
        }
 
        /**