Merge pull request #6247 from owncloud/memcached-multiple-servers
Add support for multiple memcached servers. * owncloud/memcached-multiple-servers: Readd support for memcached_server config variable. Add support for multiple memcached servers.
This commit is contained in:
commit
bbfd97ce03
|
@ -120,8 +120,14 @@ $CONFIG = array(
|
||||||
/* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
|
/* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
|
||||||
"mail_smtppassword" => "",
|
"mail_smtppassword" => "",
|
||||||
|
|
||||||
/* memcached hostname and port (Only used when xCache, APC and APCu are absent.) */
|
/* memcached servers (Only used when xCache, APC and APCu are absent.) */
|
||||||
"memcached_server" => array('localhost', 11211),
|
"memcached_servers" => array(
|
||||||
|
// hostname, port and optional weight. Also see:
|
||||||
|
// http://www.php.net/manual/en/memcached.addservers.php
|
||||||
|
// http://www.php.net/manual/en/memcached.addserver.php
|
||||||
|
array('localhost', 11211),
|
||||||
|
//array('other.host.local', 11211),
|
||||||
|
),
|
||||||
|
|
||||||
/* How long should ownCloud keep deleted files in the trash bin, default value: 30 days */
|
/* How long should ownCloud keep deleted files in the trash bin, default value: 30 days */
|
||||||
'trashbin_retention_obligation' => 30,
|
'trashbin_retention_obligation' => 30,
|
||||||
|
|
|
@ -18,8 +18,16 @@ class Memcached extends Cache {
|
||||||
parent::__construct($prefix);
|
parent::__construct($prefix);
|
||||||
if (is_null(self::$cache)) {
|
if (is_null(self::$cache)) {
|
||||||
self::$cache = new \Memcached();
|
self::$cache = new \Memcached();
|
||||||
list($host, $port) = \OC_Config::getValue('memcached_server', array('localhost', 11211));
|
$servers = \OC_Config::getValue('memcached_servers');
|
||||||
self::$cache->addServer($host, $port);
|
if (!$servers) {
|
||||||
|
$server = \OC_Config::getValue('memcached_server');
|
||||||
|
if ($server) {
|
||||||
|
$servers = array($server);
|
||||||
|
} else {
|
||||||
|
$servers = array(array('localhost', 11211));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self::$cache->addServers($servers);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue