From: Antoine Musso <hashar@free.fr>
Date: Fri, 8 Jun 2012 12:29:43 +0000 (+0200)
Subject: (but 37072) - infinite loop with runJobs.php
X-Git-Tag: 1.31.0-rc.0~23363
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=dc9c2a62798854025f2e286ab9760c9d6afe6bed;p=lhc%2Fweb%2Fwiklou.git

(but 37072) - infinite loop with runJobs.php

This is similar to fb69ee4 ( https://gerrit.wikimedia.org/r/9116 ) which
fixed nextJobDB.php. This patch make sure runJobs.php does not proceed
jobs listed in $wgJobTypesExcludedFromDefaultQueue , at least not by
default.

We will probably want to factor out common code between runJobs and
nextJobDB.

Change-Id: Id0c8896d7a0d5b58e678db1ce314174d44e1cae3
---

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 6068311e99..a75696a771 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -61,7 +61,9 @@ class RunJobs extends Maintenance {
 		$dbw = wfGetDB( DB_MASTER );
 		$n = 0;
 		$conds = '';
-		if ( $type !== false ) {
+		if ( $type === false ) {
+			$conds = Job::defaultQueueConditions( );
+		} else {
 			$conds = "job_cmd = " . $dbw->addQuotes( $type );
 		}