[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Don't override message key in badpass log entries

2016-11-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Don't override message key in badpass log entries
..


Don't override message key in badpass log entries

This causes the log message to be the i18n message
which is not what is wanted.

Change-Id: I2d3bf9849186ae3191c49fd05e8d6b4cc65f5972
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5b3181c..d878f92 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1509,13 +1509,13 @@
$headers = apache_request_headers();
 
$logger = LoggerFactory::getInstance( 'badpass' );
-   $logger->info( 'Login failed for sysop {name} from {ip} - {xff} 
- {ua}: {message}', [
+   $logger->info( 'Login failed for sysop {name} from {ip} - {xff} 
- {ua}: {messagestr}', [
'name' => $user->getName(),
'ip' => $wgRequest->getIP(),
'xff' => @$headers['X-Forwarded-For'],
'ua' => @$headers['User-Agent'],
'guessed' => $guessed,
-   'message' => $response->message->toString(),
+   'messagestr' => $response->message->toString(),
] );
}
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/319134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d3bf9849186ae3191c49fd05e8d6b4cc65f5972
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Don't override message key in badpass log entries

2016-11-01 Thread Brian Wolff (Code Review) 
Brian Wolff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319134

Change subject: Don't override message key in badpass log entries
..

Don't override message key in badpass log entries

This causes the log message to be the i18n message
which is not what is wanted.

Change-Id: I2d3bf9849186ae3191c49fd05e8d6b4cc65f5972
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/34/319134/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 57d844c..bd2b9df 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1511,13 +1511,13 @@
$headers = apache_request_headers();
 
$logger = LoggerFactory::getInstance( 'badpass' );
-   $logger->info( 'Login failed for sysop {name} from {ip} - {xff} 
- {ua}: {message}', [
+   $logger->info( 'Login failed for sysop {name} from {ip} - {xff} 
- {ua}: {messagestr}', [
'name' => $user->getName(),
'ip' => $wgRequest->getIP(),
'xff' => @$headers['X-Forwarded-For'],
'ua' => @$headers['User-Agent'],
'guessed' => $guessed,
-   'message' => $response->message->toString(),
+   'messagestr' => $response->message->toString(),
] );
}
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/319134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d3bf9849186ae3191c49fd05e8d6b4cc65f5972
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits