X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueue.php;h=9b13aea2d896dd22c64d7aa7b14f72f460edeb31;hb=2f406cc6adb30bd3ae1449589e809e108dba10bc;hp=ff6d922046c2e7c932e715937332c134f6ad97c2;hpb=bc8c89d2df39d64f15770d29874904ebcff2f131;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php index ff6d922046..9b13aea2d8 100644 --- a/includes/jobqueue/JobQueue.php +++ b/includes/jobqueue/JobQueue.php @@ -373,7 +373,7 @@ abstract class JobQueue { // Flag this job as an old duplicate based on its "root" job... try { if ( $job && $this->isRootJobOldDuplicate( $job ) ) { - JobQueue::incrStats( 'job-pop-duplicate', $this->type ); + JobQueue::incrStats( 'job-pop-duplicate', $this->type, 1, $this->wiki ); $job = DuplicateJob::newFromJob( $job ); // convert to a no-op } } catch ( MWException $e ) { @@ -706,11 +706,15 @@ abstract class JobQueue { * @param string $key Event type * @param string $type Job type * @param int $delta + * @param string $wiki Wiki ID (added in 1.23) * @since 1.22 */ - public static function incrStats( $key, $type, $delta = 1 ) { + public static function incrStats( $key, $type, $delta = 1, $wiki = null ) { wfIncrStats( $key, $delta ); wfIncrStats( "{$key}-{$type}", $delta ); + if ( $wiki !== null ) { + wfIncrStats( "{$key}-{$type}-{$wiki}", $delta ); + } } /**