https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
dda6411
..
9e9c00f
100644
(file)
--- a/
src/Core/Cache/MemcachedCacheDriver.php
+++ b/
src/Core/Cache/MemcachedCacheDriver.php
@@
-4,10
+4,13
@@
namespace Friendica\Core\Cache;
use Friendica\Core\Cache;
use Friendica\Core\Cache;
+use Exception;
+use Memcached;
+
/**
* Memcached Cache Driver
*
/**
* Memcached Cache Driver
*
- * @author Hypolite Petovan <
mrpetovan@gmail
.com>
+ * @author Hypolite Petovan <
hypolite@mrpetovan
.com>
*/
class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
{
*/
class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
{
@@
-19,18
+22,34
@@
class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
*/
private $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)) {
public function __construct(array $memcached_hosts)
{
if (!class_exists('Memcached', false)) {
- throw new
\
Exception('Memcached class isn\'t available');
+ throw new Exception('Memcached class isn\'t available');
}
}
- $this->memcached = new \Memcached();
+ $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) {
$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));
+ throw new Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
}
}
}
}
@@
-42,7
+61,7
@@
class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
// We fetch with the hostname as key to avoid problems with other applications
$value = $this->memcached->get($cachekey);
// 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) {
+ if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
$return = $value;
}
$return = $value;
}
@@
-58,7
+77,7
@@
class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
return $this->memcached->set(
$cachekey,
$value,
return $this->memcached->set(
$cachekey,
$value,
-
time() +
$ttl
+ $ttl
);
} else {
return $this->memcached->set(
);
} else {
return $this->memcached->set(
@@
-75,9
+94,13
@@
class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
return $this->memcached->delete($cachekey);
}
return $this->memcached->delete($cachekey);
}
- public function clear()
+ public function clear(
$outdated = true
)
{
{
- return $this->memcached->flush();
+ if ($outdated) {
+ return true;
+ } else {
+ return $this->memcached->flush();
+ }
}
/**
}
/**