X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FshowJobs.php;h=a989aef9addfa36a906b665aeac1455377dad571;hb=65d4f08a18d65309c887afdbca823556a8eba489;hp=b8dc554841c719248d140a28ed37126e995debd8;hpb=04d7d46b1d39340121698ba76fd8e433f60929c9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index b8dc554841..a989aef9ad 100644
--- a/maintenance/showJobs.php
+++ b/maintenance/showJobs.php
@@ -38,16 +38,19 @@ class ShowJobs extends Maintenance {
 		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 complete list of all jobs in a machine-readable format, instead of statistics'
-		);
+		$this->addOption( 'list',
+			'Show a list of all jobs in a machine-readable format, instead of statistics' );
+		$this->addOption( 'type', 'Only show/count jobs of a given type', false, true );
 	}
 
 	public function execute() {
+		$filterType = $this->getOption( 'type', '' );
 		$group = JobQueueGroup::singleton();
 		if ( $this->hasOption( 'list' ) ) {
 			foreach ( $group->getQueueTypes() as $type ) {
+				if ( $filterType != '' && $type != $filterType ) {
+					continue;
+				}
 				$queue = $group->get( $type );
 				foreach ( $queue->getAllQueuedJobs() as $job ) {
 					$this->output( $job->toString() . " status=unclaimed\n" );
@@ -55,9 +58,18 @@ class ShowJobs extends Maintenance {
 				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" );
+				}
 			}
 		} elseif ( $this->hasOption( 'group' ) ) {
 			foreach ( $group->getQueueTypes() as $type ) {
+				if ( $filterType != '' && $type != $filterType ) {
+					continue;
+				}
 				$queue = $group->get( $type );
 				$delayed = $queue->getDelayedCount();
 				$pending = $queue->getSize();
@@ -75,6 +87,9 @@ class ShowJobs extends Maintenance {
 		} else {
 			$count = 0;
 			foreach ( $group->getQueueTypes() as $type ) {
+				if ( $filterType != '' && $type != $filterType ) {
+					continue;
+				}
 				$count += $group->get( $type )->getSize();
 			}
 			$this->output( "$count\n" );