X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FshowJobs.php;h=e054a364da0464384291951c415b01c5894b23ed;hb=052f1fcf308c7fabdaf0b177a776a1fe795c2789;hp=831746d607dde5ad3a09dbd5bf7660e869d1e7b6;hpb=fcd48b5e9501abd4a90ba2c3384d401e91ed3ed0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index 831746d607..e054a364da 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,13 +38,24 @@ 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() {
 		$group = JobQueueGroup::singleton();
-		if ( $this->hasOption( 'group' ) ) {
+		if ( $this->hasOption( 'list' ) ) {
 			foreach ( $group->getQueueTypes() as $type ) {
-				$queue   = $group->get( $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();
@@ -67,4 +78,4 @@ class ShowJobs extends Maintenance {
 }
 
 $maintClass = "ShowJobs";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;