$file = $this->getOption( 'file' );
if ( $username === null && $file === null ) {
- $this->error( 'Either --user or --file is required', 1 );
+ $this->fatalError( 'Either --user or --file is required' );
} elseif ( $username !== null && $file !== null ) {
- $this->error( 'Cannot use both --user and --file', 1 );
+ $this->fatalError( 'Cannot use both --user and --file' );
}
if ( $username !== null ) {
$usernames = is_readable( $file ) ?
file( $file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES ) : false;
if ( $usernames === false ) {
- $this->error( "Could not open $file", 2 );
+ $this->fatalError( "Could not open $file", 2 );
}
}
foreach ( $usernames as $username ) {
$i++;
$user = User::newFromName( $username );
- if ( $user->getId() ) {
+ try {
$sessionManager->invalidateSessionsForUser( $user );
- $this->output( "Invalidated sessions for user $username\n" );
- } else {
- $this->output( "Could not find user $username\n" );
+ if ( $user->getId() ) {
+ $this->output( "Invalidated sessions for user $username\n" );
+ } else {
+ # session invalidation might still work if there is a central identity provider
+ $this->output( "Could not find user $username, tried to invalidate anyway\n" );
+ }
+ } catch ( Exception $e ) {
+ $this->output( "Failed to invalidate sessions for user $username | "
+ . str_replace( [ "\r", "\n" ], ' ', $e->getMessage() ) . "\n" );
}
- if ( $i % $this->mBatchSize ) {
+ if ( $i % $this->getBatchSize() ) {
$lbFactory->waitForReplication();
}
}
}
}
-$maintClass = "InvalidateUserSesssions";
+$maintClass = InvalidateUserSesssions::class;
require_once RUN_MAINTENANCE_IF_MAIN;