X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FshowJobs.php;h=a9f7d8b41936c048166e902453a6b5b11540c03d;hb=1a115f50040d1d3d2b72ca4b86c824d47fd23d5b;hp=e7ddfa80891f9e40d03b8869101492cb5dd8ff08;hpb=3dc6844ae15512838c9ec70b4903090c2723967f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index e7ddfa8089..a9f7d8b419 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,27 +38,52 @@ 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 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( 'group' ) ) {
+		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" );
+				}
+				foreach ( $queue->getAllDelayedJobs() as $job ) {
+					$this->output( $job->toString() . " status=delayed\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();
 				$claimed = $queue->getAcquiredCount();
 				$abandoned = $queue->getAbandonedCount();
-				$active = ( $claimed - $abandoned );
-				if ( ( $pending + $claimed ) > 0 ) {
+				$active = max( 0, $claimed - $abandoned );
+				if ( ( $pending + $claimed + $delayed + $abandoned ) > 0 ) {
 					$this->output(
 						"{$type}: $pending queued; " .
-						"$claimed claimed ($active active, $abandoned abandoned)\n"
+						"$claimed claimed ($active active, $abandoned abandoned); " .
+						"$delayed delayed\n"
 					);
 				}
 			}
 		} else {
 			$count = 0;
 			foreach ( $group->getQueueTypes() as $type ) {
+				if ( $filterType != '' && $type != $filterType ) {
+					continue;
+				}
 				$count += $group->get( $type )->getSize();
 			}
 			$this->output( "$count\n" );
@@ -67,4 +92,4 @@ class ShowJobs extends Maintenance {
 }
 
 $maintClass = "ShowJobs";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;