* fixed table duplication for unit tests

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

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 70228ff..0edf7ac 100644 (file)
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -24,19 +24,18 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class RunJobs extends Maintenance {
        public function __construct() {
-               global $wgUseNormalUser;
                parent::__construct();
                $this->mDescription = "Run pending jobs";
                $this->addOption( 'maxjobs', 'Maximum number of jobs to run', false, true );
+               $this->addOption( 'maxtime', 'Maximum amount of wall-clock time', false, true );
                $this->addOption( 'type', 'Type of job to run', false, true );
                $this->addOption( 'procs', 'Number of processes to use', false, true );
-               $wgUseNormalUser = true;
        }
-       
+
        public function memoryLimit() {
                // Don't eat all memory on the machine if we get a bad job.
                return "150M";
@@ -45,37 +44,37 @@ class RunJobs extends Maintenance {
        public function execute() {
                global $wgTitle;
                if ( $this->hasOption( 'procs' ) ) {
-                       $procs = intval( $this->getOption('procs') );
+                       $procs = intval( $this->getOption( 'procs' ) );
                        if ( $procs < 1 || $procs > 1000 ) {
                                $this->error( "Invalid argument to --procs", true );
                        }
                        $fc = new ForkController( $procs );
-                       if ( $fc->start( $procs ) != 'child' ) {
+                       if ( $fc->start() != 'child' ) {
                                exit( 0 );
                        }
                }
-               $maxJobs = $this->getOption( 'maxjobs', 10000 );
+               $maxJobs = $this->getOption( 'maxjobs', false );
+               $maxTime = $this->getOption( 'maxtime', false );
+               $startTime = time();
                $type = $this->getOption( 'type', false );
                $wgTitle = Title::newFromText( 'RunJobs.php' );
                $dbw = wfGetDB( DB_MASTER );
                $n = 0;
                $conds = '';
-               if ($type !== false)
-                       $conds = "job_cmd = " . $dbw->addQuotes($type);
+               if ( $type !== false )
+                       $conds = "job_cmd = " . $dbw->addQuotes( $type );
 
                while ( $dbw->selectField( 'job', 'job_id', $conds, 'runJobs.php' ) ) {
-                       $offset=0;
-                       for (;;) {
-                               $job = ($type == false) ?
-                                               Job::pop($offset)
-                                               : Job::pop_type($type);
-       
-                               if ($job == false)
+                       $offset = 0;
+                       for ( ; ; ) {
+                               $job = !$type ? Job::pop( $offset ) : Job::pop_type( $type );
+
+                               if ( !$job )
                                        break;
-       
-                               wfWaitForSlaves( 5 );
+
+                               wfWaitForSlaves();
                                $t = microtime( true );
-                               $offset=$job->id;
+                               $offset = $job->id;
                                $status = $job->run();
                                $t = microtime( true ) - $t;
                                $timeMs = intval( $t * 1000 );
@@ -84,9 +83,13 @@ class RunJobs extends Maintenance {
                                } else {
                                        $this->runJobsLog( $job->toString() . " t=$timeMs good" );
                                }
+
                                if ( $maxJobs && ++$n > $maxJobs ) {
                                        break 2;
                                }
+                               if ( $maxTime && time() - $startTime > $maxTime ) {
+                                       break 2;
+                               }
                        }
                }
        }
@@ -102,4 +105,4 @@ class RunJobs extends Maintenance {
 }
 
 $maintClass = "RunJobs";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );