From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 13 Oct 2018 07:14:38 +0000 (-0700)
Subject: jobqueue: clean up JobQueueDB::getCacheKey() to use makeGlobalKey()
X-Git-Tag: 1.34.0-rc.0~3778^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=c947f3288d9c29d54ed382bff2f4bfb3b6f617ea;p=lhc%2Fweb%2Fwiklou.git

jobqueue: clean up JobQueueDB::getCacheKey() to use makeGlobalKey()

Change-Id: I341720fda0d242c7822f78048cb49f63538d08bc
---

diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index 0b85fbe8be..0ae106db8e 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -787,10 +787,10 @@ class JobQueueDB extends JobQueue {
 	 * @return string
 	 */
 	private function getCacheKey( $property ) {
-		list( $db, $prefix ) = wfSplitWikiID( $this->wiki );
 		$cluster = is_string( $this->cluster ) ? $this->cluster : 'main';
 
-		return wfForeignMemcKey( $db, $prefix, 'jobqueue', $cluster, $this->type, $property );
+		return $this->cache->makeGlobalKey(
+			'jobqueue', $this->wiki, $cluster, $this->type, $property );
 	}
 
 	/**