diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2011-06-22 11:28:20 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2011-06-22 11:28:20 +0200 |
commit | 9db190c7e736ec8d063187d4241b59feaf7dc2d1 (patch) | |
tree | 46d1a0dee7febef5c2d57a9f7b972be16a163b3d /maintenance/runJobs.php | |
parent | 78677c7bbdcc9739f6c10c75935898a20e1acd9e (diff) |
update to MediaWiki 1.17.0
Diffstat (limited to 'maintenance/runJobs.php')
-rw-r--r-- | maintenance/runJobs.php | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php index e03bf5d1..79ea7bfe 100644 --- a/maintenance/runJobs.php +++ b/maintenance/runJobs.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( dirname(__FILE__) . '/Maintenance.php' ); +require_once( dirname( __FILE__ ) . '/Maintenance.php' ); class RunJobs extends Maintenance { public function __construct() { @@ -34,7 +34,7 @@ class RunJobs extends Maintenance { $this->addOption( 'type', 'Type of job to run', false, true ); $this->addOption( 'procs', 'Number of processes to use', false, true ); } - + public function memoryLimit() { // Don't eat all memory on the machine if we get a bad job. return "150M"; @@ -43,7 +43,7 @@ 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 ); } @@ -58,22 +58,20 @@ class RunJobs extends Maintenance { $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 ); $t = microtime( true ); - $offset=$job->id; + $offset = $job->id; $status = $job->run(); $t = microtime( true ) - $t; $timeMs = intval( $t * 1000 ); @@ -100,4 +98,4 @@ class RunJobs extends Maintenance { } $maintClass = "RunJobs"; -require_once( DO_MAINTENANCE ); +require_once( RUN_MAINTENANCE_IF_MAIN ); |