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

Merge "Revert "memcached: better error messaging""

Browse source
This commit is contained in:
Aaron Schulz 2012-07-25 19:30:46 +00:00 committed by Gerrit Code Review
commit 0336260756
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/objectcache/MemcachedClient.php
View file

@ -895,10 +895,7 @@ class MWMemcached {
function _load_items( $sock, &$ret ) {
while ( 1 ) {
$decl = fgets( $sock );
if( $decl === false ) {
$this->_debugprint( "Error reading socket for a memcached response\n" );
return 0;
} elseif ( $decl == "END\r\n" ) {
if ( $decl == "END\r\n" ) {
return true;
} elseif ( preg_match( '/^VALUE (\S+) (\d+) (\d+)\r\n$/', $decl, $match ) ) {
list( $rkey, $flags, $len ) = array( $match[1], $match[2], $match[3] );
@ -942,12 +939,7 @@ class MWMemcached {
}
} else {
$peer = $peerAddress = $peerPort = '';
$gotPeer = socket_getpeername( $sock, $peerAddress, $peerPort );
if( $gotPeer ) {
$peer = " from [$peerAddress:$peerPort";
}
$this->_debugprint( "Error parsing memcached response{$peer}\n" );
$this->_debugprint( "Error parsing memcached response\n" );
return 0;
}
}