Merge "Rewrite pref cleanup script"

[lhc/web/wiklou.git] / maintenance / invalidateUserSessions.php

diff --git a/maintenance/invalidateUserSessions.php b/maintenance/invalidateUserSessions.php
index 11e3372..8d877a5 100644 (file)
--- a/maintenance/invalidateUserSessions.php
+++ b/maintenance/invalidateUserSessions.php
@@ -49,9 +49,9 @@ class InvalidateUserSesssions extends Maintenance {
                $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 ) {
@@ -60,7 +60,7 @@ class InvalidateUserSesssions extends Maintenance {
                        $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 );
                        }
                }
 
@@ -83,12 +83,12 @@ class InvalidateUserSesssions extends Maintenance {
                                        . 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;