Made RecentChangesUpdateJob lock wiki specific

Change-Id: I566d81affcd3d60cd5e8da090db9ea79495e7722

diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index 9f22ba4..236b4d4 100644 (file)
--- 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__ );
        }
 }