From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 13 May 2014 19:33:19 +0000 (+0000)
Subject: Merge "Improved rate limit log to mention IP"
X-Git-Tag: 1.31.0-rc.0~15733
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=02b1c42009db8bec0b58fbf9124554328b614dd6;hp=2e50b896f1a55667ced32502caa9681c36df7587;p=lhc%2Fweb%2Fwiklou.git

Merge "Improved rate limit log to mention IP"
---

diff --git a/includes/User.php b/includes/User.php
index 8198282e22..6578341acb 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1759,7 +1759,8 @@ class User {
 			// Already pinged?
 			if ( $count ) {
 				if ( $count >= $max ) {
-					wfDebugLog( 'ratelimit', $this->getName() . " tripped! $key at $count $summary" );
+					wfDebugLog( 'ratelimit', "User '{$this->getName()}' " .
+						"(IP {$this->getRequest()->getIP()}) tripped $key at $count $summary" );
 					$triggered = true;
 				} else {
 					wfDebug( __METHOD__ . ": ok. $key at $count $summary\n" );