MediaWiki 1.15.0

[autoinstallsdev/mediawiki.git] / maintenance / rebuildFileCache.php

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 125b8842ecab517344dacd038bc34c9a7e43c950..8c01b90fa870b842e31a4a7450c9370c70531cf2 100644 (file)
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -17,6 +17,7 @@ $wgDisableCounters = false; // no real hits here
 $start = isset($args[0]) ? intval($args[0]) : 0;
 $overwrite = isset( $args[1] ) && $args[1] === 'overwrite';
 echo "Building content page file cache from page {$start}!\n";
+echo "Format: <start> [overwrite]\n";
 
 $dbr = wfGetDB( DB_SLAVE );
 $start = $start > 0 ? $start : $dbr->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
@@ -34,6 +35,7 @@ $end += $BATCH_SIZE - 1;
 $blockStart = $start;
 $blockEnd = $start + $BATCH_SIZE - 1;
 
+$dbw = wfGetDB( DB_MASTER );
 // Go through each page and save the output
 while( $blockEnd <= $end ) {
        // Get the pages
@@ -60,8 +62,6 @@ while( $blockEnd <= $end ) {
                                        echo "Page {$row->page_id} already cached\n";
                                        continue; // done already!
                                }
-                       } else {
-                               echo "Page {$row->page_id} not cached\n";
                        }
                        ob_start( array(&$cache, 'saveToFileCache' ) ); // save on ob_end_clean()
                        $wgUseFileCache = false; // hack, we don't want $wgArticle fiddling with filecache
@@ -77,6 +77,7 @@ while( $blockEnd <= $end ) {
                } else {
                        echo "Page {$row->page_id} not cacheable\n";
                }
+               $dbw->commit(); // commit any changes
        }
        $blockStart += $BATCH_SIZE;
        $blockEnd += $BATCH_SIZE;