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 091e648..edb4911 100644 (file)
--- 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();