X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fdeferred%2FCdnCacheUpdate.php;h=4ce9e62369d5a8a622f1f284e0f0834b2e081eda;hb=6cc415a26e219af87661f8a1de7e758a065a1060;hp=32f6adc6420ea53a6e18396f61eb6924c40fd4b3;hpb=e3bd13db0c285f312e31bb1b7271af4628cca80c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php
index 32f6adc642..4ce9e62369 100644
--- a/includes/deferred/CdnCacheUpdate.php
+++ b/includes/deferred/CdnCacheUpdate.php
@@ -22,6 +22,7 @@
  */
 
 use Wikimedia\Assert\Assert;
+use MediaWiki\MediaWikiServices;
 
 /**
  * Handles purging appropriate CDN URLs given a title (or titles)
@@ -109,13 +110,20 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
 		wfDebugLog( 'squid', __METHOD__ . ': ' . implode( ' ', $urlArr ) );
 
 		// Reliably broadcast the purge to all edge nodes
-		$relayer = EventRelayerGroup::singleton()->getRelayer( 'cdn-url-purges' );
-		$relayer->notify(
+		$relayer = MediaWikiServices::getInstance()->getEventRelayerGroup()
+					->getRelayer( 'cdn-url-purges' );
+		$ts = microtime( true );
+		$relayer->notifyMulti(
 			'cdn-url-purges',
-			[
-				'urls' => array_values( $urlArr ), // JSON array
-				'timestamp' => microtime( true )
-			]
+			array_map(
+				function ( $url ) use ( $ts ) {
+					return [
+						'url' => $url,
+						'timestamp' => $ts,
+					];
+				},
+				$urlArr
+			)
 		);
 
 		// Send lossy UDP broadcasting if enabled