X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueueRedis.php;h=b868128d597da2ec4a333c4ba13239a09cdeab9e;hb=c984a1f2f8e9f409bdf7d8464447bfe39c8bc178;hp=7dad014e45151c70d81b961c59ddae28932f476e;hpb=04d149b816c23b9a35db9e2258ee43eb04edd2d6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php
index 7dad014e45..b868128d59 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -93,7 +93,7 @@ class JobQueueRedis extends JobQueue {
 		parent::__construct( $params );
 		$params['redisConfig']['serializer'] = 'none'; // make it easy to use Lua
 		$this->server = $params['redisServer'];
-		$this->compression = isset( $params['compression'] ) ? $params['compression'] : 'none';
+		$this->compression = $params['compression'] ?? 'none';
 		$this->redisPool = RedisConnectionPool::singleton( $params['redisConfig'] );
 		if ( empty( $params['daemonized'] ) ) {
 			throw new InvalidArgumentException(
@@ -776,7 +776,7 @@ LUA;
 	 * @return string JSON
 	 */
 	private function encodeQueueName() {
-		return json_encode( [ $this->type, $this->wiki ] );
+		return json_encode( [ $this->type, $this->domain ] );
 	}
 
 	/**
@@ -809,8 +809,9 @@ LUA;
 	 */
 	private function getQueueKey( $prop, $type = null ) {
 		$type = is_string( $type ) ? $type : $this->type;
-		list( $db, $prefix ) = wfSplitWikiID( $this->wiki );
-		$keyspace = $prefix ? "$db-$prefix" : $db;
+
+		// Use wiki ID for b/c
+		$keyspace = WikiMap::getWikiIdFromDomain( $this->domain );
 
 		$parts = [ $keyspace, 'jobqueue', $type, $prop ];