From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Wed, 16 Jan 2013 19:08:16 +0000 (+0100)
Subject: Follow-up Id75401be (e32c8afe): no more need to prefix debug messages
X-Git-Tag: 1.31.0-rc.0~21019^2
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=b1f8855078f2c7a55cabd0230ea239f7ff876f6b;p=lhc%2Fweb%2Fwiklou.git

Follow-up Id75401be (e32c8afe): no more need to prefix debug messages

Since that revision, messages sent through wfDebugLog() and without
a corresponding entry in $wgDebugLogGroups will be prefixed there
before being sent to wfDebug(), so it's no longer needed to have the
exact same checks for the debug messages in memcached clients.

Change-Id: Ia690a87bc6d1994fe371816470efde6d09e3b881
---

diff --git a/includes/objectcache/MemcachedBagOStuff.php b/includes/objectcache/MemcachedBagOStuff.php
index 922c8e6a94..aebcbe73bb 100644
--- a/includes/objectcache/MemcachedBagOStuff.php
+++ b/includes/objectcache/MemcachedBagOStuff.php
@@ -179,11 +179,6 @@ class MemcachedBagOStuff extends BagOStuff {
 	 * Send a debug message to the log
 	 */
 	protected function debugLog( $text ) {
-		global $wgDebugLogGroups;
-		if( !isset( $wgDebugLogGroups['memcached'] ) ) {
-			# Prefix message since it will end up in main debug log file
-			$text = "memcached: $text";
-		}
 		if ( substr( $text, -1 ) !== "\n" ) {
 			$text .= "\n";
 		}
diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index 1ab59c68b7..faa676d0a4 100644
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -1067,11 +1067,6 @@ class MWMemcached {
 	 * @param $text string
 	 */
 	function _debugprint( $text ) {
-		global $wgDebugLogGroups;
-		if( !isset( $wgDebugLogGroups['memcached'] ) ) {
-			# Prefix message since it will end up in main debug log file
-			$text = "memcached: $text";
-		}
 		wfDebugLog( 'memcached', $text );
 	}