From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 3 Oct 2013 21:27:10 +0000 (-0700)
Subject: Added wiki ID to getCoalesceLocationInternal()
X-Git-Tag: 1.31.0-rc.0~18614^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=b4d4a6249adf315ec0ce3e9c1427d71f7db50838;p=lhc%2Fweb%2Fwiklou.git

Added wiki ID to getCoalesceLocationInternal()

Change-Id: Ia1ab1883808b669e3c3b442d860c1c562e984564
---

diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index 2052fc10d9..af21bc16d1 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -605,7 +605,9 @@ class JobQueueDB extends JobQueue {
 	}
 
 	public function getCoalesceLocationInternal() {
-		return $this->cluster ? "DBCluster:{$this->cluster}" : "LBFactory:{$this->wiki}";
+		return $this->cluster
+			? "DBCluster:{$this->cluster}:{$this->wiki}"
+			: "LBFactory:{$this->wiki}";
 	}
 
 	protected function doGetSiblingQueuesWithJobs( array $types ) {