banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow the timeout and retry interval for memcached servers to be configured

Browse Source
pull/265/head
Jeroen van Meeuwen (Kolab Systems) 10 years ago
parent 09d52dbb67
commit c3e441044d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File

7
program/lib/Roundcube/rcube.php
Unescape Escape View File

@ -215,7 +215,10 @@ class rcube
$this->mc_available = 0; $this->mc_available = 0;
// add all configured hosts to pool // add all configured hosts to pool
$pconnect = $this->config->get('memcache_pconnect', true); $pconnect = $this->config->get('memcache_pconnect', true);
$timeout = $this->config->get('memcache_timeout', 1);
$retry_interval = $this->config->get('memcache_retry_interval', 15);
foreach ($this->config->get('memcache_hosts', array()) as $host) { foreach ($this->config->get('memcache_hosts', array()) as $host) {
if (substr($host, 0, 7) != 'unix://') { if (substr($host, 0, 7) != 'unix://') {
list($host, $port) = explode(':', $host); list($host, $port) = explode(':', $host);
@ -226,7 +229,7 @@ class rcube
} }
$this->mc_available += intval($this->memcache->addServer( $this->mc_available += intval($this->memcache->addServer(
$host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure'))); $host, $port, $pconnect, 1, $timeout, $retry_interval, false, array($this, 'memcache_failure')));
} }
// test connection and failover (will result in $this->mc_available == 0 on complete failure) // test connection and failover (will result in $this->mc_available == 0 on complete failure)

Write Preview
Loading…
Cancel
Save