Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Record timing of thumbnail generation and store pull

Browse source 
Bug: T105681
Change-Id: If2edf285dc47736abde957a117ac4b40716072aa
This commit is contained in:
Gilles Dubuc 2015-07-14 11:21:21 +02:00
parent 414aa39026
commit 103eff5bcd
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
thumb.php
View file

@ -298,12 +298,19 @@ function wfStreamThumb( array $params ) {
$headers[] = 'Vary: ' . implode( ', ', $varyHeader );
}
$stats = RequestContext::getMain()->getStats();
// Stream the file if it exists already...
$thumbPath = $img->getThumbPath( $thumbName );
if ( $img->getRepo()->fileExists( $thumbPath ) ) {
$starttime = microtime( true );
$success = $img->getRepo()->streamFile( $thumbPath, $headers );
$streamtime = microtime( true ) - $starttime;
if ( !$success ) {
wfThumbError( 500, 'Could not stream the file' );
} else {
$stats->timing( 'media.thumbnail.stream', $streamtime );
}
return;
}
@ -318,7 +325,9 @@ function wfStreamThumb( array $params ) {
}
// Actually generate a new thumbnail
$starttime = microtime( true );
list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
$generatetime = microtime( true ) - $starttime;
/** @var MediaTransformOutput|bool $thumb */
// Check for thumbnail generation errors...
@ -339,6 +348,8 @@ function wfStreamThumb( array $params ) {
if ( $errorMsg !== false ) {
wfThumbError( $errorCode, $errorMsg );
} else {
$stats->timing( 'media.thumbnail.generate', $generatetime );
// Stream the file if there were no errors
$success = $thumb->streamFile( $headers );
if ( !$success ) {