From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 21 Apr 2013 21:56:20 +0000 (-0700)
Subject: Include cluster name in JobQueueDB cache keys.
X-Git-Tag: 1.31.0-rc.0~19895^2
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=68473dd5fb56099456c405e2a23b98b4a7c5cffb;p=lhc%2Fweb%2Fwiklou.git

Include cluster name in JobQueueDB cache keys.

* This makes it work properly with JobQueueFederated.

Change-Id: I0309dee7e97fa3813dfa5f1ae1eb1fcbca14b829
---

diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index e8e03852af..27e927c52a 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -689,7 +689,8 @@ class JobQueueDB extends JobQueue {
 	 */
 	private function getCacheKey( $property ) {
 		list( $db, $prefix ) = wfSplitWikiID( $this->wiki );
-		return wfForeignMemcKey( $db, $prefix, 'jobqueue', $this->type, $property );
+		$cluster = is_string( $this->cluster ) ? $this->cluster : 'main';
+		return wfForeignMemcKey( $db, $prefix, 'jobqueue', $cluster, $this->type, $property );
 	}
 
 	/**