geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-19 06:47:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Predis\Client::getConnection() internals.

Browse Source
This commit is contained in:
Daniele Alessandri
2011-04-11 18:53:02 +02:00
parent 55899e7741
commit a348e32144
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Client.php
+10 -13
View File
@@ -95,14 +95,7 @@ class Client {
}
public function getClientFor($connectionAlias) {
if (!Helpers::isCluster($this->_connection)) {
throw new ClientException(
'This method is supported only when the client is connected to a cluster of connections'
);
}
$connection = $this->_connection->getConnectionById($connectionAlias);
if ($connection === null) {
if (($connection = $this->getConnection($connectionAlias)) === null) {
throw new \InvalidArgumentException(
"Invalid connection alias: '$connectionAlias'"
);
@@ -127,12 +120,16 @@ class Client {
}
public function getConnection($id = null) {
if ($id === null) {
return $this->_connection;
if (isset($id)) {
if (!Helpers::isCluster($this->_connection)) {
throw new ClientException(
'Retrieving connections by alias is supported '.
'only with clustered connections'
);
}
return $this->_connection->getConnectionById($id);
}
$connection = $this->_connection;
$isCluster = Helpers::isCluster($connection);
return $isCluster ? $connection->getConnectionById($id) : $connection;
return $this->_connection;
}
public function __call($method, $arguments) {