From df342ebda54a24aaa1feb3d959caca19550d3889 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerg=C5=91=20Tisza?= <gtisza@wikimedia.org>
Date: Wed, 10 Aug 2016 01:32:28 +0000
Subject: [PATCH] Rename 'authmanager' log channel to 'authevents'

Also, move some events which did not belong there to the
'authentication' channel.

Change-Id: I4d7564343318899fc498ed2bd2d5260041ee22cc
---
 includes/Setup.php                              | 2 +-
 includes/api/ApiAuthManagerHelper.php           | 2 +-
 includes/api/ApiLogin.php                       | 4 ++--
 includes/specialpage/AuthManagerSpecialPage.php | 2 +-
 includes/specials/SpecialCreateAccount.php      | 2 +-
 includes/specials/SpecialUserLogin.php          | 2 +-
 includes/user/User.php                          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index 7909889251..cbe4e2e9d3 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -840,7 +840,7 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
 			true
 		);
 		Profiler::instance()->scopedProfileOut( $ps_autocreate );
-		\MediaWiki\Logger\LoggerFactory::getInstance( 'authmanager' )->info( 'Autocreation attempt', [
+		\MediaWiki\Logger\LoggerFactory::getInstance( 'authevents' )->info( 'Autocreation attempt', [
 			'event' => 'autocreate',
 			'status' => $res,
 		] );
diff --git a/includes/api/ApiAuthManagerHelper.php b/includes/api/ApiAuthManagerHelper.php
index fe5675a840..c970f932d7 100644
--- a/includes/api/ApiAuthManagerHelper.php
+++ b/includes/api/ApiAuthManagerHelper.php
@@ -238,7 +238,7 @@ class ApiAuthManagerHelper {
 		}
 
 		$module = $this->module->getModuleName();
-		LoggerFactory::getInstance( 'authmanager' )->info( "$module API attempt", [
+		LoggerFactory::getInstance( 'authevents' )->info( "$module API attempt", [
 			'event' => $event,
 			'status' => $status,
 			'module' => $module,
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index b9f65b370f..851252ccd9 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -115,7 +115,7 @@ class ApiLogin extends ApiBase {
 			} else {
 				$authRes = 'Failed';
 				$message = $status->getMessage();
-				LoggerFactory::getInstance( 'authmanager' )->info(
+				LoggerFactory::getInstance( 'authentication' )->info(
 					'BotPassword login failed: ' . $status->getWikiText( false, false, 'en' )
 				);
 			}
@@ -226,7 +226,7 @@ class ApiLogin extends ApiBase {
 		if ( $loginType === 'LoginForm' && isset( LoginForm::$statusCodes[$authRes] ) ) {
 			$authRes = LoginForm::$statusCodes[$authRes];
 		}
-		LoggerFactory::getInstance( 'authmanager' )->info( 'Login attempt', [
+		LoggerFactory::getInstance( 'authevents' )->info( 'Login attempt', [
 			'event' => 'login',
 			'successful' => $authRes === 'Success',
 			'loginType' => $loginType,
diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php
index c889b73776..85b8dc3ad6 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -455,7 +455,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
 				// passed to AuthManager. Normally we would display the form with an error message,
 				// but for the data we received via the redirect flow that would not be helpful at all.
 				// Let's just submit the data to AuthManager directly instead.
-				LoggerFactory::getInstance( 'authmanager' )
+				LoggerFactory::getInstance( 'authentication' )
 					->warning( 'Validation error on return', [ 'data' => $form->mFieldData,
 						'status' => $status->getWikiText() ] );
 				$status = $this->handleFormSubmit( $form->mFieldData );
diff --git a/includes/specials/SpecialCreateAccount.php b/includes/specials/SpecialCreateAccount.php
index f06a19255a..2b43a49cee 100644
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -159,7 +159,7 @@ class SpecialCreateAccount extends LoginSignupSpecialPage {
 	}
 
 	protected function logAuthResult( $success, $status = null ) {
-		LoggerFactory::getInstance( 'authmanager' )->info( 'Account creation attempt', [
+		LoggerFactory::getInstance( 'authevents' )->info( 'Account creation attempt', [
 			'event' => 'accountcreation',
 			'successful' => $success,
 			'status' => $status,
diff --git a/includes/specials/SpecialUserLogin.php b/includes/specials/SpecialUserLogin.php
index 21f565902b..253cd507aa 100644
--- a/includes/specials/SpecialUserLogin.php
+++ b/includes/specials/SpecialUserLogin.php
@@ -153,7 +153,7 @@ class SpecialUserLogin extends LoginSignupSpecialPage {
 	}
 
 	protected function logAuthResult( $success, $status = null ) {
-		LoggerFactory::getInstance( 'authmanager' )->info( 'Login attempt', [
+		LoggerFactory::getInstance( 'authevents' )->info( 'Login attempt', [
 			'event' => 'login',
 			'successful' => $success,
 			'status' => $status,
diff --git a/includes/user/User.php b/includes/user/User.php
index 36526d767b..7ba1d91314 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -3768,7 +3768,7 @@ class User implements IDBAccessObject {
 			ScopedCallback::consume( $delay );
 			$error = false;
 		}
-		\MediaWiki\Logger\LoggerFactory::getInstance( 'authmanager' )->info( 'Logout', [
+		\MediaWiki\Logger\LoggerFactory::getInstance( 'authevents' )->info( 'Logout', [
 			'event' => 'logout',
 			'successful' => $error === false,
 			'status' => $error ?: 'success',
-- 
2.20.1