summaryrefslogtreecommitdiff
path: root/maintenance/runJobs.php
diff options
context:
space:
mode:
Diffstat (limited to 'maintenance/runJobs.php')
-rw-r--r--maintenance/runJobs.php28
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 );