X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcopyJobQueue.php;h=7dd40b839fe705efbe0f226cd28e4f8e7b7bb868;hb=0c341778ac7e3750f6709d39daa3225127814187;hp=c5a78278f7fda245ec62c87923618e2151d4c9f0;hpb=4114333da508a12e3d806345475534fb10aa871c;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/copyJobQueue.php b/maintenance/copyJobQueue.php index c5a78278f7..7dd40b839f 100644 --- a/maintenance/copyJobQueue.php +++ b/maintenance/copyJobQueue.php @@ -34,7 +34,7 @@ require_once __DIR__ . '/Maintenance.php'; class CopyJobQueue extends Maintenance { public function __construct() { parent::__construct(); - $this->mDescription = "Copy jobs from one queue system to another."; + $this->addDescription( 'Copy jobs from one queue system to another.' ); $this->addOption( 'src', 'Key to $wgJobQueueMigrationConfig for source', true, true ); $this->addOption( 'dst', 'Key to $wgJobQueueMigrationConfig for destination', true, true ); $this->addOption( 'type', 'Types of jobs to copy (use "all" for all)', true, true ); @@ -48,17 +48,17 @@ class CopyJobQueue extends Maintenance { $dstKey = $this->getOption( 'dst' ); if ( !isset( $wgJobQueueMigrationConfig[$srcKey] ) ) { - $this->error( "\$wgJobQueueMigrationConfig not set for '$srcKey'.", 1 ); + $this->fatalError( "\$wgJobQueueMigrationConfig not set for '$srcKey'." ); } elseif ( !isset( $wgJobQueueMigrationConfig[$dstKey] ) ) { - $this->error( "\$wgJobQueueMigrationConfig not set for '$dstKey'.", 1 ); + $this->fatalError( "\$wgJobQueueMigrationConfig not set for '$dstKey'." ); } $types = ( $this->getOption( 'type' ) === 'all' ) ? JobQueueGroup::singleton()->getQueueTypes() - : array( $this->getOption( 'type' ) ); + : [ $this->getOption( 'type' ) ]; foreach ( $types as $type ) { - $baseConfig = array( 'type' => $type, 'wiki' => wfWikiID() ); + $baseConfig = [ 'type' => $type, 'wiki' => wfWikiID() ]; $src = JobQueue::factory( $baseConfig + $wgJobQueueMigrationConfig[$srcKey] ); $dst = JobQueue::factory( $baseConfig + $wgJobQueueMigrationConfig[$dstKey] ); @@ -73,14 +73,14 @@ class CopyJobQueue extends Maintenance { protected function copyJobs( JobQueue $src, JobQueue $dst, $jobs ) { $total = 0; $totalOK = 0; - $batch = array(); + $batch = []; foreach ( $jobs as $job ) { ++$total; $batch[] = $job; - if ( count( $batch ) >= $this->mBatchSize ) { + if ( count( $batch ) >= $this->getBatchSize() ) { $dst->push( $batch ); $totalOK += count( $batch ); - $batch = array(); + $batch = []; $dst->waitForBackups(); } } @@ -89,7 +89,8 @@ class CopyJobQueue extends Maintenance { $totalOK += count( $batch ); $dst->waitForBackups(); } - return array( $total, $totalOK ); + + return [ $total, $totalOK ]; } }