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

Port #156 to the current master branch.

Browse Source 
This fix the parsing of responses to INFO when the node is configured
to work with redis-sentinel.
This commit is contained in:
Daniele Alessandri
2014-03-25 14:46:13 +01:00
parent 451d28ee66
commit a51ff2d6e5
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Command/ServerInfo.php
+23 -13
View File
@@ -34,27 +34,37 @@ class ServerInfo extends Command
$infoLines = preg_split('/\r?\n/', $data);
foreach ($infoLines as $row) {
@list($k, $v) = explode(':', $row);
if ($row === '' || !isset($v)) {
if (strpos($row, ':') === false) {
continue;
}
if (!preg_match('/^db\d+$/', $k)) {
if ($k === 'allocation_stats') {
$info[$k] = $this->parseAllocationStats($v);
continue;
}
$info[$k] = $v;
} else {
$info[$k] = $this->parseDatabaseStats($v);
}
list($k, $v) = $this->parseRow($row);
$info[$k] = $v;
}
return $info;
}
/**
* Parses a single row of the response and returns the key-value pair.
*
* @param string $row Single row of the response.
* @return array
*/
protected function parseRow($row)
{
list($k, $v) = explode(':', $row, 2);
if (!preg_match('/^db\d+$/', $k)) {
if ($k === 'allocation_stats') {
$v = $this->parseAllocationStats($v);
}
} else {
$v = $this->parseDatabaseStats($v);
}
return array($k, $v);
}
/**
* Extracts the statistics of each logical DB from the string buffer.
*
lib/Predis/Command/ServerInfoV26x.php
+2 -12
View File
@@ -41,18 +41,8 @@ class ServerInfoV26x extends ServerInfo
continue;
}
list($k, $v) = explode(':', $row);
if (!preg_match('/^db\d+$/', $k)) {
if ($k === 'allocation_stats') {
$current[$k] = $this->parseAllocationStats($v);
continue;
}
$current[$k] = $v;
} else {
$current[$k] = $this->parseDatabaseStats($v);
}
list($k, $v) = $this->parseRow($row);
$current[$k] = $v;
}
return $info;