From 867aa23133777935b49a18b74b65eace2f6f5f21 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 11 Feb 2015 09:54:34 -0800 Subject: [PATCH] Made RecentChangesUpdateJob lock wiki specific Change-Id: I566d81affcd3d60cd5e8da090db9ea79495e7722 --- includes/jobqueue/jobs/RecentChangesUpdateJob.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php index 9f22ba4a58..236b4d4b76 100644 --- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php +++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php @@ -58,9 +58,11 @@ class RecentChangesUpdateJob extends Job { protected function purgeExpiredRows() { global $wgRCMaxAge; + $lockKey = wfWikiID() . ':recentchanges-prune'; + $dbw = wfGetDB( DB_MASTER ); - if ( !$dbw->lock( 'recentchanges-prune', __METHOD__, 1 ) ) { - return true; // already in progress + if ( !$dbw->lock( $lockKey, __METHOD__, 1 ) ) { + return; // already in progress } $cutoff = $dbw->timestamp( time() - $wgRCMaxAge ); @@ -76,6 +78,6 @@ class RecentChangesUpdateJob extends Job { } } while ( $rcIds ); - $dbw->unlock( 'recentchanges-prune', __METHOD__ ); + $dbw->unlock( $lockKey, __METHOD__ ); } } -- 2.20.1