X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FshowJobs.php;h=25a096c04800e5b5e69219c61c293367d82383b6;hb=7028f7e31c92ca254ff9af64ff98cd092331b570;hp=a989aef9addfa36a906b665aeac1455377dad571;hpb=9c092814c7f275db78a6ed769aa76fdd87709c60;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php index a989aef9ad..25a096c048 100644 --- a/maintenance/showJobs.php +++ b/maintenance/showJobs.php @@ -34,42 +34,53 @@ require_once __DIR__ . '/Maintenance.php'; * @ingroup Maintenance */ class ShowJobs extends Maintenance { + protected static $stateMethods = array( + 'unclaimed' => 'getAllQueuedJobs', + 'delayed' => 'getAllDelayedJobs', + 'claimed' => 'getAllAcquiredJobs', + 'abandoned' => 'getAllAbandonedJobs', + ); + public function __construct() { parent::__construct(); $this->mDescription = "Show number of jobs waiting in master database"; $this->addOption( 'group', 'Show number of jobs per job type' ); - $this->addOption( 'list', - 'Show a list of all jobs in a machine-readable format, instead of statistics' ); + $this->addOption( 'list', 'Show a list of all jobs instead of counts' ); $this->addOption( 'type', 'Only show/count jobs of a given type', false, true ); + $this->addOption( 'status', 'Filter list by state (unclaimed,delayed,claimed,abandoned)' ); + $this->addOption( 'limit', 'Limit of jobs listed' ); } public function execute() { - $filterType = $this->getOption( 'type', '' ); + $typeFilter = $this->getOption( 'type', '' ); + $stateFilter = $this->getOption( 'status', '' ); + $stateLimit = (float)$this->getOption( 'limit', INF ); + $group = JobQueueGroup::singleton(); + + $filteredTypes = $typeFilter + ? array( $typeFilter ) + : $group->getQueueTypes(); + $filteredStates = $stateFilter + ? array_intersect_key( self::$stateMethods, array( $stateFilter => 1 ) ) + : self::$stateMethods; + if ( $this->hasOption( 'list' ) ) { - foreach ( $group->getQueueTypes() as $type ) { - if ( $filterType != '' && $type != $filterType ) { - continue; - } + $count = 0; + foreach ( $filteredTypes as $type ) { $queue = $group->get( $type ); - foreach ( $queue->getAllQueuedJobs() as $job ) { - $this->output( $job->toString() . " status=unclaimed\n" ); - } - foreach ( $queue->getAllDelayedJobs() as $job ) { - $this->output( $job->toString() . " status=delayed\n" ); - } - foreach ( $queue->getAllAcquiredJobs() as $job ) { - $this->output( $job->toString() . " status=claimed\n" ); - } - foreach ( $queue->getAllAbandonedJobs() as $job ) { - $this->output( $job->toString() . " status=abandoned\n" ); + foreach ( $filteredStates as $state => $method ) { + foreach ( $queue->$method() as $job ) { + /** @var Job $job */ + $this->output( $job->toString() . " status=$state\n" ); + if ( ++$count >= $stateLimit ) { + return; + } + } } } } elseif ( $this->hasOption( 'group' ) ) { - foreach ( $group->getQueueTypes() as $type ) { - if ( $filterType != '' && $type != $filterType ) { - continue; - } + foreach ( $filteredTypes as $type ) { $queue = $group->get( $type ); $delayed = $queue->getDelayedCount(); $pending = $queue->getSize(); @@ -86,10 +97,7 @@ class ShowJobs extends Maintenance { } } else { $count = 0; - foreach ( $group->getQueueTypes() as $type ) { - if ( $filterType != '' && $type != $filterType ) { - continue; - } + foreach ( $filteredTypes as $type ) { $count += $group->get( $type )->getSize(); } $this->output( "$count\n" );