From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 25 Jul 2012 19:28:08 +0000 (+0000)
Subject: Revert "memcached: better error messaging"
X-Git-Tag: 1.31.0-rc.0~22958^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=1caa1d73619005b79e3fb1071fba2d874dc03e31;p=lhc%2Fweb%2Fwiklou.git

Revert "memcached: better error messaging"

This always issues PHP notices when the code is hit.

This reverts commit fe6da52a11375c83d86f73bf4725d14acfbf4cbf
---

diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index eda57c0725..ec67a3955f 100644
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -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;
 			}
 		}