geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-01 05:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increased the default connection timeout from 2 to 5 seconds and moved the initialization of its value in ConnectionParameters->filterConnectionParams.

Browse Source
This commit is contained in:
Daniele Alessandri
2010-02-26 23:22:13 +01:00
parent e229153800
commit 806ef6058d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis.php
+3 -5
View File
@@ -553,6 +553,7 @@ class MultiExecBlock {
class ConnectionParameters {
const DEFAULT_HOST = '127.0.0.1';
const DEFAULT_PORT = 6379;
const DEFAULT_TIMEOUT = 5;
private $_parameters;
public function __construct($parameters) {
@@ -604,7 +605,7 @@ class ConnectionParameters {
'port' => (int) self::getParamOrDefault($parameters, 'port', self::DEFAULT_PORT),
'database' => self::getParamOrDefault($parameters, 'database'),
'password' => self::getParamOrDefault($parameters, 'password'),
'connection_timeout' => self::getParamOrDefault($parameters, 'connection_timeout'),
'connection_timeout' => self::getParamOrDefault($parameters, 'connection_timeout', self::DEFAULT_TIMEOUT),
'read_write_timeout' => self::getParamOrDefault($parameters, 'read_write_timeout'),
);
}
@@ -627,8 +628,6 @@ interface IConnection {
}
class Connection implements IConnection {
const CONNECTION_TIMEOUT = 2;
private $_params, $_socket, $_initCmds;
public function __construct(ConnectionParameters $parameters) {
@@ -649,8 +648,7 @@ class Connection implements IConnection {
throw new ClientException('Connection already estabilished');
}
$uri = sprintf('tcp://%s:%d/', $this->_params->host, $this->_params->port);
$connectionTimeout = $this->_params->connection_timeout ?: self::CONNECTION_TIMEOUT;
$this->_socket = @stream_socket_client($uri, $errno, $errstr, $connectionTimeout);
$this->_socket = @stream_socket_client($uri, $errno, $errstr, $this->_params->connection_timeout);
if (!$this->_socket) {
throw new ClientException(trim($errstr), $errno);
}