Deprecating: Consolidating `progressive` & `constructive` buttons

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

diff --git a/maintenance/copyJobQueue.php b/maintenance/copyJobQueue.php
index e833115..42c2dd4 100644 (file)
--- 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 );
@@ -78,19 +78,18 @@ class CopyJobQueue extends Maintenance {
                        ++$total;
                        $batch[] = $job;
                        if ( count( $batch ) >= $this->mBatchSize ) {
-                               if ( $dst->push( $batch ) ) {
-                                       $totalOK += count( $batch );
-                               }
+                               $dst->push( $batch );
+                               $totalOK += count( $batch );
                                $batch = array();
                                $dst->waitForBackups();
                        }
                }
                if ( count( $batch ) ) {
-                       if ( $dst->push( $batch ) ) {
-                               $totalOK += count( $batch );
-                       }
+                       $dst->push( $batch );
+                       $totalOK += count( $batch );
                        $dst->waitForBackups();
                }
+
                return array( $total, $totalOK );
        }
 }