X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialRunJobs.php;h=54f224acece5cfdec62d6e31889e7b88b055f803;hb=9a83edf6a27638cfe55924a4baf0a3081bf45e6f;hp=4c8c8f308108d8cc309aa2e33476c69493d931bd;hpb=d5884183f4de9db480e11422b59716c5560b90fc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialRunJobs.php b/includes/specials/SpecialRunJobs.php
index 4c8c8f3081..54f224acec 100644
--- a/includes/specials/SpecialRunJobs.php
+++ b/includes/specials/SpecialRunJobs.php
@@ -47,7 +47,7 @@ class SpecialRunJobs extends UnlistedSpecialPage {
 			return;
 		}
 
-		$optional = array( 'maxjobs' => 0 );
+		$optional = array( 'maxjobs' => 0, 'maxtime' => 30, 'type' => false, 'async' => true );
 		$required = array_flip( array( 'title', 'tasks', 'signature', 'sigexpiry' ) );
 
 		$params = array_intersect_key( $this->getRequest()->getValues(), $required + $optional );
@@ -75,18 +75,28 @@ class SpecialRunJobs extends UnlistedSpecialPage {
 		// Apply any default parameter values
 		$params += $optional;
 
-		// Client will usually disconnect before checking the response,
-		// but it needs to know when it is safe to disconnect. Until this
-		// reaches ignore_user_abort(), it is not safe as the jobs won't run.
-		ignore_user_abort( true ); // jobs may take a bit of time
-		header( "HTTP/1.0 202 Accepted" );
-		ob_flush();
-		flush();
-		// Once the client receives this response, it can disconnect
+		if ( $params['async'] ) {
+			// Client will usually disconnect before checking the response,
+			// but it needs to know when it is safe to disconnect. Until this
+			// reaches ignore_user_abort(), it is not safe as the jobs won't run.
+			ignore_user_abort( true ); // jobs may take a bit of time
+			header( "HTTP/1.0 202 Accepted" );
+			ob_flush();
+			flush();
+			// Once the client receives this response, it can disconnect
+		}
 
 		// Do all of the specified tasks...
 		if ( in_array( 'jobs', explode( '|', $params['tasks'] ) ) ) {
-			self::executeJobs( (int)$params['maxjobs'] );
+			$runner = new JobRunner();
+			$response = $runner->run( array(
+				'type'     => $params['type'],
+				'maxJobs'  => $params['maxjobs'] ? $params['maxjobs'] : 1,
+				'maxTime'  => $params['maxtime'] ? $params['maxjobs'] : 30
+			) );
+			if ( !$params['async'] ) {
+				print FormatJson::encode( $response, true );
+			}
 		}
 	}
 
@@ -100,52 +110,4 @@ class SpecialRunJobs extends UnlistedSpecialPage {
 		ksort( $query ); // stable order
 		return hash_hmac( 'sha1', wfArrayToCgi( $query ), $wgSecretKey );
 	}
-
-	/**
-	 * Run jobs from the job queue
-	 *
-	 * @note: also called from Wiki.php
-	 *
-	 * @param int $maxJobs Maximum number of jobs to run
-	 * @return void
-	 */
-	public static function executeJobs( $maxJobs ) {
-		$n = $maxJobs; // number of jobs to run
-		if ( $n < 1 ) {
-			return;
-		}
-		try {
-			$group = JobQueueGroup::singleton();
-			$count = $group->executeReadyPeriodicTasks();
-			if ( $count > 0 ) {
-				wfDebugLog( 'jobqueue', "Executed $count periodic queue task(s)." );
-			}
-
-			do {
-				$job = $group->pop( JobQueueGroup::TYPE_DEFAULT, JobQueueGroup::USE_CACHE );
-				if ( $job ) {
-					$output = $job->toString() . "\n";
-					$t = -microtime( true );
-					wfProfileIn( __METHOD__ . '-' . get_class( $job ) );
-					$success = $job->run();
-					wfProfileOut( __METHOD__ . '-' . get_class( $job ) );
-					$group->ack( $job ); // done
-					$t += microtime( true );
-					$t = round( $t * 1000 );
-					if ( $success === false ) {
-						$output .= "Error: " . $job->getLastError() . ", Time: $t ms\n";
-					} else {
-						$output .= "Success, Time: $t ms\n";
-					}
-					wfDebugLog( 'jobqueue', $output );
-				}
-			} while ( --$n && $job );
-		} catch ( MWException $e ) {
-			MWExceptionHandler::rollbackMasterChangesAndLog( $e );
-			// We don't want exceptions thrown during job execution to
-			// be reported to the user since the output is already sent.
-			// Instead we just log them.
-			MWExceptionHandler::logException( $e );
-		}
-	}
 }