Update "mrpetovan" email address

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

diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index 1a8bdc9..9e9c00f 100644 (file)
--- a/src/Core/Cache/MemcachedCacheDriver.php
+++ b/src/Core/Cache/MemcachedCacheDriver.php
@@ -1,68 +1,119 @@
-<?php\r
-\r
-namespace Friendica\Core\Cache;\r
-\r
-use Friendica\BaseObject;\r
-use Friendica\Core\Cache;\r
-\r
-/**\r
- * Memcached Cache Driver\r
- *\r
- * @author Hypolite Petovan <mrpetovan@gmail.com>\r
- */\r
-class MemcachedCacheDriver extends BaseObject implements ICacheDriver\r
-{\r
-       /**\r
-        * @var Memcached\r
-        */\r
-       private $memcached;\r
-\r
-       public function __construct(array $memcached_hosts)\r
-       {\r
-               if (!class_exists('Memcached', false)) {\r
-                       throw new \Exception('Memcached class isn\'t available');\r
-               }\r
-\r
-               $this->memcached = new \Memcached();\r
-\r
-               $this->memcached->addServers($memcached_hosts);\r
-\r
-               if (count($this->memcached->getServerList()) == 0) {\r
-                       throw new \Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));\r
-               }\r
-       }\r
-\r
-       public function get($key)\r
-       {\r
-               $return = null;\r
-\r
-               // We fetch with the hostname as key to avoid problems with other applications\r
-               $value = $this->memcached->get(self::getApp()->get_hostname() . ':' . $key);\r
-\r
-               if ($this->memcached->getResultCode() === \Memcached::RES_SUCCESS) {\r
-                       $return = $value;\r
-               }\r
-\r
-               return $return;\r
-       }\r
-\r
-       public function set($key, $value, $duration = Cache::MONTH)\r
-       {\r
-               // We store with the hostname as key to avoid problems with other applications\r
-               return $this->memcached->set(\r
-                       self::getApp()->get_hostname() . ":" . $key,\r
-                       $value,\r
-                       time() + $duration\r
-               );\r
-       }\r
-\r
-       public function delete($key)\r
-       {\r
-               return $this->memcached->delete($key);\r
-       }\r
-\r
-       public function clear()\r
-       {\r
-               return true;\r
-       }\r
-}\r
+<?php
+
+namespace Friendica\Core\Cache;
+
+use Friendica\Core\Cache;
+
+use Exception;
+use Memcached;
+
+/**
+ * Memcached Cache Driver
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
+{
+       use TraitCompareSet;
+       use TraitCompareDelete;
+
+       /**
+        * @var \Memcached
+        */
+       private $memcached;
+
+       /**
+        * Due to limitations of the INI format, the expected configuration for Memcached servers is the following:
+        * array {
+        *   0 => "hostname, port(, weight)",
+        *   1 => ...
+        * }
+        *
+        * @param array $memcached_hosts
+        * @throws \Exception
+        */
+       public function __construct(array $memcached_hosts)
+       {
+               if (!class_exists('Memcached', false)) {
+                       throw new Exception('Memcached class isn\'t available');
+               }
+
+               $this->memcached = new Memcached();
+
+               array_walk($memcached_hosts, function (&$value) {
+                       if (is_string($value)) {
+                               $value = array_map('trim', explode(',', $value));
+                       }
+               });
+
+               $this->memcached->addServers($memcached_hosts);
+
+               if (count($this->memcached->getServerList()) == 0) {
+                       throw new Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
+               }
+       }
+
+       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 $return;
+       }
+
+       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->memcached->set(
+                               $cachekey,
+                               $value,
+                               $ttl
+                       );
+               } else {
+                       return $this->memcached->set(
+                               $cachekey,
+                               $value
+                       );
+               }
+
+       }
+
+       public function delete($key)
+       {
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcached->delete($cachekey);
+       }
+
+       public function clear($outdated = true)
+       {
+               if ($outdated) {
+                       return true;
+               } else {
+                       return $this->memcached->flush();
+               }
+       }
+
+       /**
+        * @brief Sets a value if it's not already stored
+        *
+        * @param string $key      The cache key
+        * @param mixed  $value    The old value we know from the cache
+        * @param int    $ttl      The cache lifespan, must be one of the Cache constants
+        * @return bool
+        */
+       public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
+       {
+               $cachekey = $this->getCacheKey($key);
+               return $this->memcached->add($cachekey, $value, $ttl);
+       }
+}