From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 3 Mar 2015 20:20:12 +0000 (-0800)
Subject: Made JobRunner bail sooner for bogus job --type parameters
X-Git-Tag: 1.31.0-rc.0~12210^2
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=bd649e656668b6faf32a54281af2c6400986655a;p=lhc%2Fweb%2Fwiklou.git

Made JobRunner bail sooner for bogus job --type parameters

Change-Id: I1259682b8a6543e76f1c9a4d99324b457115a277
---

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 091e648d7a..edb491159d 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -87,6 +87,8 @@ class JobRunner implements LoggerAwareInterface {
 	 * @return array Summary response that can easily be JSON serialized
 	 */
 	public function run( array $options ) {
+		global $wgJobClasses;
+
 		$response = array( 'jobs' => array(), 'reached' => 'none-ready' );
 
 		$type = isset( $options['type'] ) ? $options['type'] : false;
@@ -94,6 +96,11 @@ class JobRunner implements LoggerAwareInterface {
 		$maxTime = isset( $options['maxTime'] ) ? $options['maxTime'] : false;
 		$noThrottle = isset( $options['throttle'] ) && !$options['throttle'];
 
+		if ( $type !== false && !isset( $wgJobClasses[$type] ) ) {
+			$response['reached'] = 'none-possible';
+			return $response;
+		}
+
 		$group = JobQueueGroup::singleton();
 		// Handle any required periodic queue maintenance
 		$count = $group->executeReadyPeriodicTasks();