From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 4 Nov 2013 21:43:44 +0000 (-0800)
Subject: Include server in redis lua errors
X-Git-Tag: 1.31.0-rc.0~18294^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=81202351ca520fb75a19fd9fb259fb20a55d4fa1;p=lhc%2Fweb%2Fwiklou.git

Include server in redis lua errors

Change-Id: Ib8dbed08fa9d8010d496475de44f61aca31fd410
---

diff --git a/includes/clientpool/RedisConnectionPool.php b/includes/clientpool/RedisConnectionPool.php
index ef71b1826a..f7653eb2a6 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -336,7 +336,8 @@ class RedisConnRef {
 		}
 
 		if ( $conn->getLastError() ) { // script bug?
-			wfDebugLog( 'redis', "Lua script error: " . $conn->getLastError() );
+			$server = $this->server;
+			wfDebugLog( 'redis', "Lua script error on server $server: " . $conn->getLastError() );
 		}
 
 		return $res;