1 files changed, 33 insertions, 14 deletions

diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index 1dceb790..afd7c745 100644
--- a/maintenance/showJobs.php
+++ b/maintenance/showJobs.php
@@ -25,7 +25,7 @@
  * @author Antoine Musso
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script that reports the number of jobs currently waiting
@@ -38,25 +38,44 @@ 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' );
 	}
+
 	public function execute() {
-		$dbw = wfGetDB( DB_MASTER );
-		if ( $this->hasOption( 'group' ) ) {
-			$res = $dbw->select(
-				'job',
-				array( 'job_cmd', 'count(*) as count' ),
-				array(),
-				__METHOD__,
-				array( 'GROUP BY' => 'job_cmd' )
-			);
-			foreach ( $res as $row ) {
-				$this->output( $row->job_cmd . ': ' . $row->count . "\n" );
+		$group = JobQueueGroup::singleton();
+		if ( $this->hasOption( 'list' ) ) {
+			foreach ( $group->getQueueTypes() 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" );
+				}
+			}
+		} elseif ( $this->hasOption( 'group' ) ) {
+			foreach ( $group->getQueueTypes() as $type ) {
+				$queue = $group->get( $type );
+				$pending = $queue->getSize();
+				$claimed = $queue->getAcquiredCount();
+				$abandoned = $queue->getAbandonedCount();
+				$active = max( 0, $claimed - $abandoned );
+				if ( ( $pending + $claimed ) > 0 ) {
+					$this->output(
+						"{$type}: $pending queued; " .
+						"$claimed claimed ($active active, $abandoned abandoned)\n"
+					);
+				}
 			}
 		} else {
-			$this->output( $dbw->selectField( 'job', 'count(*)', '', __METHOD__ ) . "\n" );
+			$count = 0;
+			foreach ( $group->getQueueTypes() as $type ) {
+				$count += $group->get( $type )->getSize();
+			}
+			$this->output( "$count\n" );
 		}
 	}
 }
 
 $maintClass = "ShowJobs";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;