Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 8 insertions, 0 deletions

diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index 847dd6f4..6c49646b 100644
--- a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
@@ -77,6 +77,7 @@ class JobQueueAggregatorRedis extends JobQueueAggregator {
 		try {
 			$conn->multi( Redis::PIPELINE );
 			$conn->hSetNx( $this->getQueueTypesKey(), $type, 'enabled' );
+			$conn->sAdd( $this->getWikiSetKey(), $wiki );
 			$conn->hSet( $this->getReadyQueueKey(), $this->encQueueName( $type, $wiki ), time() );
 			$conn->exec();
 
@@ -198,6 +199,13 @@ class JobQueueAggregatorRedis extends JobQueueAggregator {
 	}
 
 	/**
+	 * @return string
+	 */
+	private function getWikiSetKey() {
+		return "jobqueue:aggregator:s-wikis:v2"; // global
+	}
+
+	/**
 	 * @param string $type
 	 * @param string $wiki
 	 * @return string