X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcopyFileBackend.php;h=3c7ffba578fd2672248259550917c5609e0f800f;hb=52b74d44d522c2a1b67f9ccc2b8f7e44b6b52d7c;hp=e2e6c6c3666e13d635d7461006f42eca1eaa3e87;hpb=5c231c241eb224c4f247a802fa3f2ee8da587a2e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php
index e2e6c6c366..3c7ffba578 100644
--- a/maintenance/copyFileBackend.php
+++ b/maintenance/copyFileBackend.php
@@ -81,7 +81,7 @@ class CopyFileBackend extends Maintenance {
 					'adviseStat' => true // avoid HEADs
 				] );
 				if ( $srcPathsRel === null ) {
-					$this->error( "Could not list files in $container.", 1 ); // die
+					$this->fatalError( "Could not list files in $container." );
 				}
 			}
 
@@ -93,7 +93,7 @@ class CopyFileBackend extends Maintenance {
 					'adviseStat' => true // avoid HEADs
 				] );
 				if ( $dstPathsRel === null ) {
-					$this->error( "Could not list files in $container.", 1 ); // die
+					$this->fatalError( "Could not list files in $container." );
 				}
 				$this->statCache = [];
 				foreach ( $dstPathsRel as $dstPathRel ) {
@@ -110,10 +110,10 @@ class CopyFileBackend extends Maintenance {
 				// Check up on the rate file periodically to adjust the concurrency
 				if ( $rateFile && ( !$count || ( $count % 500 ) == 0 ) ) {
 					$this->setBatchSize( max( 1, (int)file_get_contents( $rateFile ) ) );
-					$this->output( "\tBatch size is now {$this->mBatchSize}.\n" );
+					$this->output( "\tBatch size is now {$this->getBatchSize()}.\n" );
 				}
 				$batchPaths[$srcPathRel] = 1; // remove duplicates
-				if ( count( $batchPaths ) >= $this->mBatchSize ) {
+				if ( count( $batchPaths ) >= $this->getBatchSize() ) {
 					$this->copyFileBatch( array_keys( $batchPaths ), $backendRel, $src, $dst );
 					$batchPaths = []; // done
 				}
@@ -137,10 +137,10 @@ class CopyFileBackend extends Maintenance {
 					// Check up on the rate file periodically to adjust the concurrency
 					if ( $rateFile && ( !$count || ( $count % 500 ) == 0 ) ) {
 						$this->setBatchSize( max( 1, (int)file_get_contents( $rateFile ) ) );
-						$this->output( "\tBatch size is now {$this->mBatchSize}.\n" );
+						$this->output( "\tBatch size is now {$this->getBatchSize()}.\n" );
 					}
 					$batchPaths[$delPathRel] = 1; // remove duplicates
-					if ( count( $batchPaths ) >= $this->mBatchSize ) {
+					if ( count( $batchPaths ) >= $this->getBatchSize() ) {
 						$this->delFileBatch( array_keys( $batchPaths ), $backendRel, $dst );
 						$batchPaths = []; // done
 					}
@@ -174,12 +174,12 @@ class CopyFileBackend extends Maintenance {
 		$srcPathsRel = $src->getFileList( [
 			'dir' => $src->getRootStoragePath() . "/$backendRel" ] );
 		if ( $srcPathsRel === null ) {
-			$this->error( "Could not list files in source container.", 1 ); // die
+			$this->fatalError( "Could not list files in source container." );
 		}
 		$dstPathsRel = $dst->getFileList( [
 			'dir' => $dst->getRootStoragePath() . "/$backendRel" ] );
 		if ( $dstPathsRel === null ) {
-			$this->error( "Could not list files in destination container.", 1 ); // die
+			$this->fatalError( "Could not list files in destination container." );
 		}
 		// Get the list of destination files
 		$relFilesDstSha1 = [];
@@ -263,7 +263,7 @@ class CopyFileBackend extends Maintenance {
 			$status = $dst->prepare( [ 'dir' => dirname( $dstPath ), 'bypassReadOnly' => 1 ] );
 			if ( !$status->isOK() ) {
 				$this->error( print_r( $status->getErrorsArray(), true ) );
-				$this->error( "$wikiId: Could not copy $srcPath to $dstPath.", 1 ); // die
+				$this->fatalError( "$wikiId: Could not copy $srcPath to $dstPath." );
 			}
 			$ops[] = [ 'op' => 'store',
 				'src' => $fsFile->getPath(), 'dst' => $dstPath, 'overwrite' => 1 ];
@@ -280,7 +280,7 @@ class CopyFileBackend extends Maintenance {
 		$elapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 );
 		if ( !$status->isOK() ) {
 			$this->error( print_r( $status->getErrorsArray(), true ) );
-			$this->error( "$wikiId: Could not copy file batch.", 1 ); // die
+			$this->fatalError( "$wikiId: Could not copy file batch." );
 		} elseif ( count( $copiedRel ) ) {
 			$this->output( "\n\tCopied these file(s) [{$elapsed_ms}ms]:\n\t" .
 				implode( "\n\t", $copiedRel ) . "\n\n" );
@@ -317,7 +317,7 @@ class CopyFileBackend extends Maintenance {
 		$elapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 );
 		if ( !$status->isOK() ) {
 			$this->error( print_r( $status->getErrorsArray(), true ) );
-			$this->error( "$wikiId: Could not delete file batch.", 1 ); // die
+			$this->fatalError( "$wikiId: Could not delete file batch." );
 		} elseif ( count( $deletedRel ) ) {
 			$this->output( "\n\tDeleted these file(s) [{$elapsed_ms}ms]:\n\t" .
 				implode( "\n\t", $deletedRel ) . "\n\n" );
@@ -374,5 +374,5 @@ class CopyFileBackend extends Maintenance {
 	}
 }
 
-$maintClass = 'CopyFileBackend';
+$maintClass = CopyFileBackend::class;
 require_once RUN_MAINTENANCE_IF_MAIN;