$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() {
}
public function execute() {
- global $wgCommandLineMode;
-
if ( $this->hasOption( 'procs' ) ) {
$procs = intval( $this->getOption( 'procs' ) );
if ( $procs < 1 || $procs > 1000 ) {
}
$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 );
+ }
}
/**