X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FCache%2FMemcachedCacheDriver.php;h=4397892a9eeda6d24fee65d4e282deb0f27ff987;hb=61693419e8cf571a2ad26690423d356023badc2e;hp=1a8bdc95030bed39152c57128bc17dd650cb5bc0;hpb=e2fd882134afe4bf4c5c9eed76fcaff5f08b1f4e;p=friendica.git

diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index 1a8bdc9503..4397892a9e 100644
--- a/src/Core/Cache/MemcachedCacheDriver.php
+++ b/src/Core/Cache/MemcachedCacheDriver.php
@@ -1,68 +1,119 @@
-<?php
-
-namespace Friendica\Core\Cache;
-
-use Friendica\BaseObject;
-use Friendica\Core\Cache;
-
-/**
- * Memcached Cache Driver
- *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
- */
-class MemcachedCacheDriver extends BaseObject implements ICacheDriver
-{
-	/**
-	 * @var Memcached
-	 */
-	private $memcached;
-
-	public function __construct(array $memcached_hosts)
-	{
-		if (!class_exists('Memcached', false)) {
-			throw new \Exception('Memcached class isn\'t available');
-		}
-
-		$this->memcached = new \Memcached();
-
-		$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;
-
-		// We fetch with the hostname as key to avoid problems with other applications
-		$value = $this->memcached->get(self::getApp()->get_hostname() . ':' . $key);
-
-		if ($this->memcached->getResultCode() === \Memcached::RES_SUCCESS) {
-			$return = $value;
-		}
-
-		return $return;
-	}
-
-	public function set($key, $value, $duration = Cache::MONTH)
-	{
-		// We store with the hostname as key to avoid problems with other applications
-		return $this->memcached->set(
-			self::getApp()->get_hostname() . ":" . $key,
-			$value,
-			time() + $duration
-		);
-	}
-
-	public function delete($key)
-	{
-		return $this->memcached->delete($key);
-	}
-
-	public function clear()
-	{
-		return true;
-	}
-}
+<?php
+
+namespace Friendica\Core\Cache;
+
+use Friendica\Core\Cache;
+
+use Exception;
+use Memcached;
+
+/**
+ * Memcached Cache Driver
+ *
+ * @author Hypolite Petovan <mrpetovan@gmail.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);
+	}
+}