merged master

[lhc/web/wiklou.git] / maintenance / archives / upgradeLogging.php

diff --git a/maintenance/archives/upgradeLogging.php b/maintenance/archives/upgradeLogging.php
index f79bbab..d406ea8 100644 (file)
--- a/maintenance/archives/upgradeLogging.php
+++ b/maintenance/archives/upgradeLogging.php
@@ -2,13 +2,32 @@
 /**
  * Replication-safe online upgrade script for log_id/log_deleted
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceArchive
  */
 
-require( dirname(__FILE__).'/../commandLine.inc' );
+require( __DIR__ . '/../commandLine.inc' );
 
 class UpdateLogging {
+
+       /**
+        * @var DatabaseBase
+        */
        var $dbw;
        var $batchSize = 1000;
        var $minTs = false;
@@ -130,7 +149,7 @@ EOT;
                        } else {
                                $conds = array( 'log_timestamp > ' . $this->dbw->addQuotes( $copyPos ) );
                        }
-                       $srcRes = $this->dbw->select( $srcTable, '*', $conds, __METHOD__, 
+                       $srcRes = $this->dbw->select( $srcTable, '*', $conds, __METHOD__,
                                array( 'LIMIT' => $batchSize, 'ORDER BY' => 'log_timestamp' ) );
 
                        if ( ! $srcRes->numRows() ) {
@@ -145,7 +164,7 @@ EOT;
                        $this->dbw->insert( $dstTable, $batch, __METHOD__ );
                        $numRowsCopied += count( $batch );
 
-                       wfWaitForSlaves( 5 );
+                       wfWaitForSlaves();
                }
                echo "Copied $numRowsCopied rows\n";
        }