Add --maxtime parameter to allow job runners to be limited by time instead of job...

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

diff --git a/maintenance/renamewiki.php b/maintenance/renamewiki.php
index c12a25f..338c45f 100644 (file)
--- a/maintenance/renamewiki.php
+++ b/maintenance/renamewiki.php
@@ -23,7 +23,7 @@
  * @ingroup Wikimedia
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class RenameWiki extends Maintenance {
        public function __construct() {
@@ -32,8 +32,8 @@ class RenameWiki extends Maintenance {
                $this->addArg( 'olddb', 'Old DB name' );
                $this->addArg( 'newdb', 'New DB name' );
        }
-       
-       protected function getDbType() {
+
+       public function getDbType() {
                return Maintenance::DB_ADMIN;
        }
 
@@ -45,7 +45,7 @@ class RenameWiki extends Maintenance {
                $to = $this->getArg( 1 );
                $this->output( "Renaming blob tables in ES from $from to $to...\n" );
                $this->output( "Sleeping 5 seconds...\n" );
-               sleep(5);
+               sleep( 5 );
 
                # Initialise external storage
                if ( is_array( $wgDefaultExternalStore ) ) {
@@ -64,13 +64,13 @@ class RenameWiki extends Maintenance {
                                if ( !preg_match( '!^DB://(.*)$!', $storeURL, $m ) ) {
                                        continue;
                                }
-       
+
                                $cluster = $m[1];
-       
+
                                # Hack
                                $wgExternalServers[$cluster][0]['user'] = $wgDBuser;
                                $wgExternalServers[$cluster][0]['password'] = $wgDBpassword;
-       
+
                                $store = new ExternalStoreDB;
                                $extdb =& $store->getMaster( $cluster );
                                $extdb->query( "SET table_type=InnoDB" );
@@ -78,7 +78,7 @@ class RenameWiki extends Maintenance {
                                $extdb->query( "ALTER TABLE {$from}.blobs RENAME TO {$to}.blobs" );
                                $extdb->selectDB( $from );
                                $extdb->sourceFile( $this->getDir() . '/storage/blobs.sql' );
-                               $extdb->immediateCommit();
+                               $extdb->commit();
                        }
                }
                $this->output( "done.\n" );
@@ -86,4 +86,4 @@ class RenameWiki extends Maintenance {
 }
 
 $maintClass = "RenameWiki";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );