Rename 'type' field of authevents channel to 'eventType'

'type' is problematic as it conflicts with a default field name
in logstash.

Bug: T145133
Change-Id: Idb73ba3e431ef2bd25b14c8562d1b3f212b4e072
Depends-On: Iab1eb47a6b6c98f3c84b4f8e2d16cbe2cdbf515b
This commit is contained in:
Gergő Tisza 2016-11-26 00:59:48 +00:00
parent f1197a7070
commit bbc318fb51
2 changed files with 9 additions and 9 deletions

View file

@ -274,7 +274,7 @@ class SimpleCaptcha {
}
LoggerFactory::getInstance( 'authevents' )->info( 'Captcha shown on account creation', [
'event' => 'captcha.display',
'type' => 'accountcreation',
'eventType' => 'accountcreation',
] );
$formInformation = $this->getFormInformation( 8 );
$formMetainfo = $formInformation;
@ -324,7 +324,7 @@ class SimpleCaptcha {
LoggerFactory::getInstance( 'authevents' )->info( 'Captcha shown on login', [
'event' => 'captcha.display',
'type' => 'login',
'eventType' => 'login',
'perIp' => $perIPTriggered,
'perUser' => $perUserTriggered
] );
@ -945,7 +945,7 @@ class SimpleCaptcha {
$success = $this->passCaptchaLimitedFromRequest( $wgRequest, $wgUser );
LoggerFactory::getInstance( 'authevents' )->info( 'Captcha submitted on account creation', [
'event' => 'captcha.submit',
'type' => 'accountcreation',
'eventType' => 'accountcreation',
'successful' => $success,
] );
if ( !$success ) {
@ -1008,7 +1008,7 @@ class SimpleCaptcha {
$success = $this->passCaptchaLimitedFromRequest( $wgRequest, $wgUser );
LoggerFactory::getInstance( 'authevents' )->info( 'Captcha submitted on login', [
'event' => 'captcha.submit',
'type' => 'login',
'eventType' => 'login',
'successful' => $success,
] );
if ( !$success ) {
@ -1329,7 +1329,7 @@ class SimpleCaptcha {
LoggerFactory::getInstance( 'authevents' )
->info( 'Captcha data added in account creation API', [
'event' => 'captcha.display',
'type' => 'accountcreation',
'eventType' => 'accountcreation',
] );
break;

View file

@ -20,7 +20,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
LoggerFactory::getInstance( 'authevents' )
->info( 'Captcha shown on account creation', [
'event' => 'captcha.display',
'type' => 'accountcreation',
'eventType' => 'accountcreation',
] );
}
break;
@ -49,7 +49,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
LoggerFactory::getInstance( 'authevents' )
->info( 'Captcha shown on account creation', [
'event' => 'captcha.display',
'type' => 'accountcreation',
'eventType' => 'accountcreation',
] );
break;
}
@ -76,7 +76,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
$success = $this->verifyCaptcha( $captcha, $reqs, new User() );
LoggerFactory::getInstance( 'authevents' )->info( 'Captcha submitted on login', [
'event' => 'captcha.submit',
'type' => 'login',
'eventType' => 'login',
'successful' => $success,
] );
}
@ -101,7 +101,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
$success = $this->verifyCaptcha( $captcha, $reqs, $user );
LoggerFactory::getInstance( 'authevents' )->info( 'Captcha submitted on account creation', [
'event' => 'captcha.submit',
'type' => 'accountcreation',
'eventType' => 'accountcreation',
'successful' => $success,
] );
if ( !$success ) {