geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-08-30 20:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added "connection_timeout" and "read_write_timeout" as optional arguments for the ConnectionParameters class.

Browse Source
This commit is contained in:
Daniele Alessandri
2009-12-30 10:25:06 +01:00
parent 55c40afcd8
commit fcecd2579a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis.php
+12 -3
View File
@@ -477,6 +477,12 @@ class ConnectionParameters {
case 'password':
$details['password'] = $v;
break;
case 'connection_timeout':
$details['connection_timeout'] = $v;
break;
case 'read_write_timeout':
$details['read_write_timeout'] = $v;
break;
}
}
$parsed = array_merge($parsed, $details);
@@ -494,7 +500,9 @@ class ConnectionParameters {
'host' => self::getParamOrDefault($parameters, 'host', self::DEFAULT_HOST),
'port' => (int) self::getParamOrDefault($parameters, 'port', self::DEFAULT_PORT),
'database' => self::getParamOrDefault($parameters, 'database'),
'password' => self::getParamOrDefault($parameters, 'password')
'password' => self::getParamOrDefault($parameters, 'password'),
'connection_timeout' => self::getParamOrDefault($parameters, 'connection_timeout'),
'read_write_timeout' => self::getParamOrDefault($parameters, 'read_write_timeout'),
);
}
@@ -535,11 +543,12 @@ class Connection implements IConnection {
throw new ClientException('Connection already estabilished');
}
$uri = sprintf('tcp://%s:%d/', $this->_params->host, $this->_params->port);
$this->_socket = @stream_socket_client($uri, $errno, $errstr, self::CONNECTION_TIMEOUT);
$connectionTimeout = $this->_params->connection_timeout ?: self::CONNECTION_TIMEOUT;
$this->_socket = @stream_socket_client($uri, $errno, $errstr, $connectionTimeout);
if (!$this->_socket) {
throw new ClientException(trim($errstr), $errno);
}
stream_set_timeout($this->_socket, self::READ_WRITE_TIMEOUT);
stream_set_timeout($this->_socket, $this->_params->read_write_timeout ?: self::READ_WRITE_TIMEOUT);
if (count($this->_initCmds) > 0){
$this->sendInitializationCommands();