X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=blobdiff_plain;f=includes%2Fdeferred%2FCdnCacheUpdate.php;h=ddffaa396b91c7de1f97ac5dba6d5cff56072685;hb=50ea56e349d62c48c69c22bbdf91514c7a9e77e1;hp=2d07f75156eb75a5c0288b1d91159ee4a7bb7cc0;hpb=848a8c49cf5ebd07d29c3fe484bd7d3ed580e65c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php
index 2d07f75156..ddffaa396b 100644
--- a/includes/deferred/CdnCacheUpdate.php
+++ b/includes/deferred/CdnCacheUpdate.php
@@ -39,8 +39,9 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
 	}
 
 	public function merge( MergeableUpdate $update ) {
-		/** @var CdnCacheUpdate $update */
+		/** @var self $update */
 		Assert::parameterType( __CLASS__, $update, '$update' );
+		'@phan-var self $update';
 
 		$this->urls = array_merge( $this->urls, $update->urls );
 	}
@@ -79,14 +80,14 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
 	}
 
 	/**
-	 * Purges a list of CDN nodes defined in $wgSquidServers.
+	 * Purges a list of CDN nodes defined in $wgCdnServers.
 	 * $urlArr should contain the full URLs to purge as values
 	 * (example: $urlArr[] = 'http://my.host/something')
 	 *
 	 * @param string[] $urlArr List of full URLs to purge
 	 */
 	public static function purge( array $urlArr ) {
-		global $wgSquidServers, $wgHTCPRouting;
+		global $wgCdnServers, $wgHTCPRouting;
 
 		if ( !$urlArr ) {
 			return;
@@ -120,20 +121,20 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
 		}
 
 		// Do direct server purges if enabled (this does not scale very well)
-		if ( $wgSquidServers ) {
-			// Maximum number of parallel connections per squid
-			$maxSocketsPerSquid = 8;
+		if ( $wgCdnServers ) {
+			// Maximum number of parallel connections per CDN
+			$maxSocketsPerCdn = 8;
 			// Number of requests to send per socket
 			// 400 seems to be a good tradeoff, opening a socket takes a while
 			$urlsPerSocket = 400;
-			$socketsPerSquid = ceil( count( $urlArr ) / $urlsPerSocket );
-			if ( $socketsPerSquid > $maxSocketsPerSquid ) {
-				$socketsPerSquid = $maxSocketsPerSquid;
+			$socketsPerCdn = ceil( count( $urlArr ) / $urlsPerSocket );
+			if ( $socketsPerCdn > $maxSocketsPerCdn ) {
+				$socketsPerCdn = $maxSocketsPerCdn;
 			}
 
 			$pool = new SquidPurgeClientPool;
-			$chunks = array_chunk( $urlArr, ceil( count( $urlArr ) / $socketsPerSquid ) );
-			foreach ( $wgSquidServers as $server ) {
+			$chunks = array_chunk( $urlArr, ceil( count( $urlArr ) / $socketsPerCdn ) );
+			foreach ( $wgCdnServers as $server ) {
 				foreach ( $chunks as $chunk ) {
 					$client = new SquidPurgeClient( $server );
 					foreach ( $chunk as $url ) {