X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=thumb.php;h=c0042c2c952cc06af717949906dd984b976d141e;hb=0d847cb55d8e9c3c0f40827828472fd9b25e1018;hp=d7bf45338241431d3324fcb90102453dd8db240d;hpb=9392d01c4e95be3c156ad594d8a8b6aa678daa7d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index d7bf453382..c0042c2c95 100644
--- a/thumb.php
+++ b/thumb.php
@@ -367,7 +367,7 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
 	global $wgMemc, $wgAttemptFailureEpoch;
 
 	$key = wfMemcKey( 'attempt-failures', $wgAttemptFailureEpoch,
-		$file->getRepo()->getName(), md5( $file->getName() ), md5( $thumbName ) );
+		$file->getRepo()->getName(), $file->getSha1(), md5( $thumbName ) );
 
 	// Check if this file keeps failing to render
 	if ( $wgMemc->get( $key ) >= 4 ) {
@@ -387,9 +387,17 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
 	$thumb = false;
 	$errorHtml = false;
 
+	// guard thumbnail rendering with PoolCounter to avoid stampedes
+	// expensive files use a separate PoolCounter config so it is possible to set up a global limit on them
+	if ( $file->isExpensiveToThumbnail() ) {
+		$poolCounterType = 'FileRenderExpensive';
+	} else {
+		$poolCounterType = 'FileRender';
+	}
+
 	// Thumbnail isn't already there, so create the new thumbnail...
 	try {
-		$work = new PoolCounterWorkViaCallback( 'FileRender', sha1( $file->getName() ),
+		$work = new PoolCounterWorkViaCallback( $poolCounterType, sha1( $file->getName() ),
 			array(
 				'doWork' => function() use ( $file, $params ) {
 					return $file->transform( $params, File::RENDER_NOW );