php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #898: supported different signature of MemCache::addServer().

Browse Source
This commit is contained in:
Qiang Xue
2013-09-22 17:02:46 -04:00
parent 93d5f5a3ec
commit f415193cdc
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
framework/yii/caching/MemCache.php
View File

@ -87,7 +87,14 @@ class MemCache extends Cache
parent::init(); parent::init();
$servers = $this->getServers(); $servers = $this->getServers();
$cache = $this->getMemCache(); $cache = $this->getMemCache();
if (count($servers)) { if (empty($servers)) {
$cache->addServer('127.0.0.1', 11211);
} else {
if (!$this->useMemcached) {
// different version of memcache may have different number of parameters for the addServer method.
$class = new \ReflectionClass($cache);
$paramCount = $class->getMethod('addServer')->getNumberOfParameters();
}
foreach ($servers as $server) { foreach ($servers as $server) {
if ($server->host === null) { if ($server->host === null) {
throw new InvalidConfigException("The 'host' property must be specified for every memcache server."); throw new InvalidConfigException("The 'host' property must be specified for every memcache server.");
@ -97,15 +104,21 @@ class MemCache extends Cache
} else { } else {
// $timeout is used for memcache versions that do not have timeoutms parameter // $timeout is used for memcache versions that do not have timeoutms parameter
$timeout = (int) ($server->timeout / 1000) + (($server->timeout % 1000 > 0) ? 1 : 0); $timeout = (int) ($server->timeout / 1000) + (($server->timeout % 1000 > 0) ? 1 : 0);
$cache->addServer( if ($paramCount === 9) {
$server->host, $server->port, $server->persistent, $cache->addServer(
$server->weight, $timeout, $server->retryInterval, $server->host, $server->port, $server->persistent,
$server->status, $server->failureCallback, $server->timeout $server->weight, $timeout, $server->retryInterval,
); $server->status, $server->failureCallback, $server->timeout
);
} else {
$cache->addServer(
$server->host, $server->port, $server->persistent,
$server->weight, $timeout, $server->retryInterval,
$server->status, $server->failureCallback
);
}
} }
} }
} else {
$cache->addServer('127.0.0.1', 11211);
} }
} }