$MCACHE - rework memcached support - some rework on eaccelerator

We now have a wrapper memcached support class to handle
initial connection setup, provide the common denominator
calls, plus getforfill() and friends.

The eaccelerator class now returns false to match memcached. The
downside of this is that we cannot store booleans as a false value
is indistinguishable from a false that indicates error or 'key not
found'.
This commit is contained in:
martinlanghoff 2006-12-27 22:47:51 +00:00
parent 2142d4924f
commit f917d0ea9b
3 changed files with 150 additions and 27 deletions

View file

@ -212,28 +212,13 @@ function setup_is_unicodedb() {
function init_memcached() {
global $CFG, $MCACHE;
if (!function_exists('memcache_connect')) {
debugging("Memcached is set to true but the memcached extension is not installed");
return false;
}
$hosts = split(',', $CFG->memcachedhosts);
$MCACHE = new Memcache;
if (count($hosts) === 1 && !empty($CFG->memcachedpconn)) {
// the faster pconnect is only available
// for single-server setups
// NOTE: PHP-PECL client is buggy and pconnect()
// will segfault if the server is unavailable
$MCACHE->pconnect($hosts[0]);
} else {
// multi-host setup will share key space
foreach ($hosts as $host) {
$host = trim($host);
$MCACHE->addServer($host);
}
}
return true;
include_once($CFG->libdir . '/memcached.class.php');
$MCACHE = new memcached;
if ($MCACHE->status()) {
return true;
}
unset($MCACHE);
return false;
}
function init_eaccelerator() {
@ -241,7 +226,7 @@ function init_eaccelerator() {
include_once($CFG->libdir . '/eaccelerator.class.php');
$MCACHE = new eaccelerator;
if ($MCACHE->status) {
if ($MCACHE->status()) {
return true;
}
unset($MCACHE);