Merge "Don't use logging reserved word 'ip' as parameter"

This commit is contained in:
jenkins-bot 2020-02-29 20:06:54 +00:00 committed by Gerrit Code Review
commit b1d452d472

View file

@ -52,11 +52,11 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
$needed = true; $needed = true;
$captcha->setAction( 'badlogin' ); $captcha->setAction( 'badlogin' );
LoggerFactory::getInstance( 'captcha' ) LoggerFactory::getInstance( 'captcha' )
->info( 'Captcha shown on login by {ip} for {suggestedUser}', [ ->info( 'Captcha shown on login by {clientip} for {suggestedUser}', [
'event' => 'captcha.display', 'event' => 'captcha.display',
'eventType' => 'accountcreation', 'eventType' => 'accountcreation',
'suggestedUser' => $suggestedUsername, 'suggestedUser' => $suggestedUsername,
'ip' => $this->manager->getRequest()->getIP() 'clientip' => $this->manager->getRequest()->getIP()
] ); ] );
break; break;
} }
@ -87,7 +87,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
'eventType' => 'login', 'eventType' => 'login',
'successful' => $success, 'successful' => $success,
'user' => $username, 'user' => $username,
'ip' => $ip 'clientip' => $ip
] ); ] );
} }
@ -116,7 +116,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
'eventType' => 'accountcreation', 'eventType' => 'accountcreation',
'successful' => $success, 'successful' => $success,
'user' => $username, 'user' => $username,
'ip' => $ip 'clientip' => $ip
] ]
); );
if ( !$success ) { if ( !$success ) {