X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrebuildFileCache.php;h=ea07f19515177a522ae182557f22d11a02364de0;hb=c071aaac159d8a750389656af29e5eb907126c19;hp=78b5ce8e16071a3f287cdee00c9e217fa912b344;hpb=2a0eea93eee966ee79967803a3b98e7cfcba5b5d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 78b5ce8e16..ea07f19515 100644
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -20,72 +20,102 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class RebuildFileCache extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Build file cache for content pages";
-		$this->addArg( 'start', 'Page_id to start from', true );
-		$this->addArg( 'overwrite', 'Refresh page cache', false );
+		$this->addOption( 'start', 'Page_id to start from', false, true );
+		$this->addOption( 'end', 'Page_id to end on', false, true );
+		$this->addOption( 'overwrite', 'Refresh page cache' );
 		$this->setBatchSize( 100 );
 	}
 
+	public function finalSetup() {
+		global $wgDebugToolbar;
+
+		// Debug toolbar makes content uncacheable so we disable it.
+		// Has to be done before Setup.php initialize MWDebug
+		$wgDebugToolbar = false;
+		parent::finalSetup();
+	}
+
 	public function execute() {
-		global $wgUseFileCache, $wgDisableCounters, $wgContentNamespaces, $wgRequestTime;
-		global $wgTitle, $wgArticle, $wgOut, $wgUser;
-		if( !$wgUseFileCache ) {
+		global $wgUseFileCache, $wgReadOnly, $wgContentNamespaces, $wgRequestTime;
+		global $wgTitle, $wgOut;
+		if ( !$wgUseFileCache ) {
 			$this->error( "Nothing to do -- \$wgUseFileCache is disabled.", true );
 		}
-		$wgDisableCounters = false;
-		$start = $this->getArg( 0, "0" );
-		if( !ctype_digit($start) ) {
+
+		$wgReadOnly = 'Building cache'; // avoid DB writes (like enotif/counters)
+
+		$start = $this->getOption( 'start', "0" );
+		if ( !ctype_digit( $start ) ) {
 			$this->error( "Invalid value for start parameter.", true );
 		}
-		$start = intval($start);
-		$overwrite = $this->hasArg(1) && $this->getArg(1) === 'overwrite';
+		$start = intval( $start );
+
+		$end = $this->getOption( 'end', "0" );
+		if ( !ctype_digit( $end ) ) {
+			$this->error( "Invalid value for end parameter.", true );
+		}
+		$end = intval( $end );
+
 		$this->output( "Building content page file cache from page {$start}!\n" );
 
 		$dbr = wfGetDB( DB_SLAVE );
-		$start = $start > 0 ? $start : $dbr->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
-		$end = $dbr->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
-		if( !$start ) {
+		$overwrite = $this->getOption( 'overwrite', false );
+		$start = ( $start > 0 )
+			? $start
+			: $dbr->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
+		$end = ( $end > 0 )
+			? $end
+			: $dbr->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+		if ( !$start ) {
 			$this->error( "Nothing to do.", true );
 		}
 
 		$_SERVER['HTTP_ACCEPT_ENCODING'] = 'bgzip'; // hack, no real client
-		OutputPage::setEncodings(); # Not really used yet
 
 		# Do remaining chunk
 		$end += $this->mBatchSize - 1;
 		$blockStart = $start;
 		$blockEnd = $start + $this->mBatchSize - 1;
-	
+
 		$dbw = wfGetDB( DB_MASTER );
 		// Go through each page and save the output
-		while( $blockEnd <= $end ) {
+		while ( $blockEnd <= $end ) {
 			// Get the pages
-			$res = $dbr->select( 'page', array('page_namespace','page_title','page_id'),
-				array('page_namespace' => $wgContentNamespaces,
+			$res = $dbr->select( 'page', array( 'page_namespace', 'page_title', 'page_id' ),
+				array( 'page_namespace' => $wgContentNamespaces,
 					"page_id BETWEEN $blockStart AND $blockEnd" ),
-				array('ORDER BY' => 'page_id ASC','USE INDEX' => 'PRIMARY')
+				array( 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' )
 			);
-			foreach( $res as $row ) {
+
+			$dbw->begin( __METHOD__ ); // for any changes
+			foreach ( $res as $row ) {
 				$rebuilt = false;
-				$wgRequestTime = wfTime(); # bug 22852
+				$wgRequestTime = microtime( true ); # bug 22852
+				
 				$wgTitle = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
-				if( null == $wgTitle ) {
+				if ( null == $wgTitle ) {
 					$this->output( "Page {$row->page_id} has bad title\n" );
 					continue; // broken title?
 				}
-				$wgOut->setTitle( $wgTitle ); // set display title
-				$wgUser->getSkin( $wgTitle ); // set skin title
-				$wgArticle = new Article( $wgTitle );
+
+				$context = new RequestContext;
+				$context->setTitle( $wgTitle );
+				$article = Article::newFromTitle( $wgTitle, $context );
+				$context->setWikiPage( $article->getPage() );
+
+				$wgOut = $context->getOutput(); // set display title
+
 				// If the article is cacheable, then load it
-				if( $wgArticle->isFileCacheable() ) {
-					$cache = new HTMLFileCache( $wgTitle );
-					if( $cache->isFileCacheGood() ) {
-						if( $overwrite ) {
+				if ( $article->isFileCacheable() ) {
+					$cache = HTMLFileCache::newFromTitle( $wgTitle, 'view' );
+					if ( $cache->isCacheGood() ) {
+						if ( $overwrite ) {
 							$rebuilt = true;
 						} else {
 							$this->output( "Page {$row->page_id} already cached\n" );
@@ -93,34 +123,34 @@ class RebuildFileCache extends Maintenance {
 						}
 					}
 					ob_start( array( &$cache, 'saveToFileCache' ) ); // save on ob_end_clean()
-					$wgUseFileCache = false; // hack, we don't want $wgArticle fiddling with filecache
-					$wgArticle->view();
-					@$wgOut->output(); // header notices
+					$wgUseFileCache = false; // hack, we don't want $article fiddling with filecache
+					$article->view();
+					wfSuppressWarnings(); // header notices
+					$wgOut->output();
+					wfRestoreWarnings();
 					$wgUseFileCache = true;
 					ob_end_clean(); // clear buffer
-					$wgOut = new OutputPage(); // empty out any output page garbage
-					if( $rebuilt )
+					if ( $rebuilt ) {
 						$this->output( "Re-cached page {$row->page_id}\n" );
-					else
+					} else {
 						$this->output( "Cached page {$row->page_id}\n" );
+					}
 				} else {
 					$this->output( "Page {$row->page_id} not cacheable\n" );
 				}
-				$dbw->commit(); // commit any changes
 			}
+			$dbw->commit( __METHOD__ ); // commit any changes (just for sanity)
+
 			$blockStart += $this->mBatchSize;
 			$blockEnd += $this->mBatchSize;
-			wfWaitForSlaves( 5 );
 		}
 		$this->output( "Done!\n" );
-	
+
 		// Remove these to be safe
-		if( isset($wgTitle) )
-			unset($wgTitle);
-		if( isset($wgArticle) )
-			unset($wgArticle);
+		if ( isset( $wgTitle ) )
+			unset( $wgTitle );
 	}
 }
 
 $maintClass = "RebuildFileCache";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );