X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FshowJobs.php;h=5e2113045b55806a48a943d061942fb77f1d72a7;hb=5eda555000550e5beebcac376508efbf89c9ae2c;hp=e054a364da0464384291951c415b01c5894b23ed;hpb=5e5579d04cfac26317ff13cd85ed8453a113c10f;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php index e054a364da..5e2113045b 100644 --- a/maintenance/showJobs.php +++ b/maintenance/showJobs.php @@ -56,14 +56,16 @@ class ShowJobs extends Maintenance { } elseif ( $this->hasOption( 'group' ) ) { foreach ( $group->getQueueTypes() as $type ) { $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 ) > 0 ) { $this->output( "{$type}: $pending queued; " . - "$claimed claimed ($active active, $abandoned abandoned)\n" + "$claimed claimed ($active active, $abandoned abandoned); " . + "$delayed delayed\n" ); } }