X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2Fjobs%2FRecentChangesUpdateJob.php;h=2d4ce34c83a6e24ff098c698dc802f778bfb490a;hb=b6ee3e52534e0c76598383318a97a0c385dd3236;hp=223ae324b8940f4fa649c3e35c47b36a7222e9c4;hpb=1dee28cb5f1efd6d9e14d6cc1d0c73c3f69269b4;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php index 223ae324b8..2d4ce34c83 100644 --- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php +++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php @@ -73,9 +73,8 @@ class RecentChangesUpdateJob extends Job { protected function purgeExpiredRows() { global $wgRCMaxAge, $wgUpdateRowsPerQuery; - $lockKey = wfWikiID() . ':recentchanges-prune'; - $dbw = wfGetDB( DB_MASTER ); + $lockKey = $dbw->getDomainID() . ':recentchanges-prune'; if ( !$dbw->lock( $lockKey, __METHOD__, 0 ) ) { // already in progress return; @@ -128,7 +127,7 @@ class RecentChangesUpdateJob extends Job { $factory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); $ticket = $factory->getEmptyTransactionTicket( __METHOD__ ); - $lockKey = wfWikiID() . '-activeusers'; + $lockKey = $dbw->getDomainID() . '-activeusers'; if ( !$dbw->lock( $lockKey, __METHOD__, 0 ) ) { // Exclusive update (avoids duplicate entries)… it's usually fine to just // drop out here, if the Job is already running.