X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrunJobs.php;h=2e011fecde54b2f356e9fdb1aed7b43f2192a5c8;hb=87a0b17127195742e6c64472dbfdac65b4d254d7;hp=0ac81a44d3ab1bd6618afeb046bf8f91205b4ab8;hpb=6e9b4f0e9ce4ccd6089c18b205065ef7fa077484;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 0ac81a44d3..2e011fecde 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -40,6 +40,7 @@ class RunJobs extends Maintenance {
 		$this->addOption( 'procs', 'Number of processes to use', false, true );
 		$this->addOption( 'nothrottle', 'Ignore job throttling configuration', false, false );
 		$this->addOption( 'result', 'Set to JSON to print only a JSON response', false, true );
+		$this->addOption( 'wait', 'Wait for new jobs instead of exiting', false, false );
 	}
 
 	public function memoryLimit() {
@@ -52,8 +53,6 @@ class RunJobs extends Maintenance {
 	}
 
 	public function execute() {
-		global $wgCommandLineMode;
-
 		if ( $this->hasOption( 'procs' ) ) {
 			$procs = intval( $this->getOption( 'procs' ) );
 			if ( $procs < 1 || $procs > 1000 ) {
@@ -67,28 +66,45 @@ class RunJobs extends Maintenance {
 		}
 
 		$outputJSON = ( $this->getOption( 'result' ) === 'json' );
-
-		// Enable DBO_TRX for atomicity; JobRunner manages transactions
-		// and works well in web server mode already (@TODO: this is a hack)
-		$wgCommandLineMode = false;
+		$wait = $this->hasOption( 'wait' );
 
 		$runner = new JobRunner( LoggerFactory::getInstance( 'runJobs' ) );
 		if ( !$outputJSON ) {
 			$runner->setDebugHandler( [ $this, 'debugInternal' ] );
 		}
 
-		$response = $runner->run( [
-			'type'     => $this->getOption( 'type', false ),
-			'maxJobs'  => $this->getOption( 'maxjobs', false ),
-			'maxTime'  => $this->getOption( 'maxtime', false ),
-			'throttle' => $this->hasOption( 'nothrottle' ) ? false : true,
-		] );
+		$type = $this->getOption( 'type', false );
+		$maxJobs = $this->getOption( 'maxjobs', false );
+		$maxTime = $this->getOption( 'maxtime', false );
+		$throttle = !$this->hasOption( 'nothrottle' );
 
-		if ( $outputJSON ) {
-			$this->output( FormatJson::encode( $response, true ) );
-		}
+		while ( true ) {
+			$response = $runner->run( [
+				'type'     => $type,
+				'maxJobs'  => $maxJobs,
+				'maxTime'  => $maxTime,
+				'throttle' => $throttle,
+			] );
+
+			if ( $outputJSON ) {
+				$this->output( FormatJson::encode( $response, true ) );
+			}
 
-		$wgCommandLineMode = true;
+			if (
+				!$wait ||
+				$response['reached'] === 'time-limit' ||
+				$response['reached'] === 'job-limit' ||
+				$response['reached'] === 'memory-limit'
+			) {
+				break;
+			}
+
+			if ( $maxJobs !== false ) {
+				$maxJobs -= count( $response['jobs'] );
+			}
+
+			sleep( 1 );
+		}
 	}
 
 	/**