namespace MediaWiki\Auth;
use Config;
+use MediaWiki\MediaWikiServices;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
use Status;
if ( self::$instance === null ) {
self::$instance = new self(
\RequestContext::getMain()->getRequest(),
- \ConfigFactory::getDefaultInstance()->makeConfig( 'main' )
+ MediaWikiServices::getInstance()->getMainConfig()
);
}
return self::$instance;
}
}
- $backoffKey = wfMemcKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
+ $backoffKey = $cache->makeKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
if ( $cache->get( $backoffKey ) ) {
$this->logger->debug( __METHOD__ . ': {username} denied by prior creation attempt failures', [
'username' => $username,
// Ignore warnings about master connections/writes...hard to avoid here
$trxProfiler = \Profiler::instance()->getTransactionProfiler();
- $trxProfiler->setSilenced( true );
+ $old = $trxProfiler->setSilenced( true );
try {
$status = $user->addToDatabase();
if ( !$status->isOK() ) {
$status = Status::newGood();
$status->warning( 'userexists' );
} else {
- $this->logger->error( __METHOD__ . ': {username} failed with message {message}', [
+ $this->logger->error( __METHOD__ . ': {username} failed with message {msg}', [
'username' => $username,
- 'message' => $status->getWikiText( null, null, 'en' )
+ 'msg' => $status->getWikiText( null, null, 'en' )
] );
$user->setId( 0 );
$user->loadFromId();
return $status;
}
} catch ( \Exception $ex ) {
- $trxProfiler->setSilenced( false );
+ $trxProfiler->setSilenced( $old );
$this->logger->error( __METHOD__ . ': {username} failed with exception {exception}', [
'username' => $username,
'exception' => $ex,
$logEntry->insert();
}
- $trxProfiler->setSilenced( false );
+ $trxProfiler->setSilenced( $old );
if ( $login ) {
$this->setSessionDataForUser( $user );
$session->set( 'AuthManager:lastAuthTimestamp', time() );
$session->persist();
- \ScopedCallback::consume( $delay );
+ \Wikimedia\ScopedCallback::consume( $delay );
\Hooks::run( 'UserLoggedIn', [ $user ] );
}