tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Bugfixing Memcached

Browse source
This commit is contained in:
Philipp Holzer 2018-10-07 10:38:45 +02:00
parent 1ec5c6b284
commit 8491f8660f
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Core/Cache/MemcachedCacheDriver.php
View file

@ -41,9 +41,6 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
$this->memcached = new Memcached(); $this->memcached = new Memcached();
$this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, false);
array_walk($memcached_hosts, function (&$value) { array_walk($memcached_hosts, function (&$value) {
if (is_string($value)) { if (is_string($value)) {
$value = array_map('trim', explode(',', $value)); $value = array_map('trim', explode(',', $value));
@ -68,7 +65,7 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
return $this->filterArrayKeysByPrefix($keys, $prefix); return $this->filterArrayKeysByPrefix($keys, $prefix);
} else { } else {
logger('Memcached \'getAllKeys\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL); logger('Memcached \'getAllKeys\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
return []; return null;
} }
} }
@ -77,17 +74,19 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
*/ */
public function get($key) public function get($key)
{ {
$return = null;
$cachekey = $this->getCacheKey($key); $cachekey = $this->getCacheKey($key);
// We fetch with the hostname as key to avoid problems with other applications // We fetch with the hostname as key to avoid problems with other applications
$value = $this->memcached->get($cachekey); $value = $this->memcached->get($cachekey);
if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) { if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
return $value; $return = $value;
} else { } else {
logger('Memcached \'get\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL); logger('Memcached \'get\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
return [];
} }
return $return;
} }
/** /**