Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set Redis::OPT_READ_TIMEOUT by default

Browse source 
* The value is also configurable just like connectTimeout
* This deals with problems like https://github.com/nicolasff/phpredis/issues/99
  and https://github.com/nicolasff/phpredis/issues/70

Change-Id: I05e91e05764020854d04673b7decae30359f57e9
This commit is contained in:
Aaron Schulz 2014-05-05 11:43:21 -07:00 committed by Ori.livneh
parent 12ba77be1c
commit c6a7a3a9ed
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/clientpool/RedisConnectionPool.php
View file

@ -44,6 +44,8 @@ class RedisConnectionPool {
*/
/** @var string Connection timeout in seconds */
protected $connectTimeout;
/** @var string Read timeout in seconds */
protected $readTimeout;
/** @var string Plaintext auth password */
protected $password;
/** @var bool Whether connections persist */
@ -76,6 +78,7 @@ class RedisConnectionPool {
'See https://www.mediawiki.org/wiki/Redis#Setup' );
}
$this->connectTimeout = $options['connectTimeout'];
$this->readTimeout = $options['readTimeout'];
$this->persistent = $options['persistent'];
$this->password = $options['password'];
if ( !isset( $options['serializer'] ) || $options['serializer'] === 'php' ) {
@ -97,6 +100,9 @@ class RedisConnectionPool {
if ( !isset( $options['connectTimeout'] ) ) {
$options['connectTimeout'] = 1;
}
if ( !isset( $options['readTimeout'] ) ) {
$options['readTimeout'] = 31; // handles up to 30 second blocking commands
}
if ( !isset( $options['persistent'] ) ) {
$options['persistent'] = false;
}
@ -112,6 +118,9 @@ class RedisConnectionPool {
* $options include:
* - connectTimeout : The timeout for new connections, in seconds.
* Optional, default is 1 second.
* - readTimeout : The timeout for operation reads, in seconds.
* Commands like BLPOP can fail if told to wait longer than this.
* Optional, default is 60 seconds.
* - persistent : Set this to true to allow connections to persist across
* multiple web requests. False by default.
* - password : The authentication password, will be sent to Redis in clear text.
@ -216,6 +225,7 @@ class RedisConnectionPool {
}
if ( $conn ) {
$conn->setOption( Redis::OPT_READ_TIMEOUT, $this->readTimeout );
$conn->setOption( Redis::OPT_SERIALIZER, $this->serializer );
$this->connections[$server][] = array( 'conn' => $conn, 'free' => false );