jenkins-bot has submitted this change and it was merged.
Change subject: Gather more information about pre rendering 500s
......................................................................
Gather more information about pre rendering 500s
Bug: T106740
Change-Id: I4a1436f1724fcc74d4c1076b21fcdb3b5d58b1de
---
M includes/jobqueue/jobs/ThumbnailRenderJob.php
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/jobs/ThumbnailRenderJob.php
b/includes/jobqueue/jobs/ThumbnailRenderJob.php
index a58fa8b..d1d9999 100644
--- a/includes/jobqueue/jobs/ThumbnailRenderJob.php
+++ b/includes/jobqueue/jobs/ThumbnailRenderJob.php
@@ -50,7 +50,8 @@
return false;
}
} elseif ( $wgUploadThumbnailRenderMethod === 'http' ) {
- $status = $this->hitThumbUrl( $file,
$transformParams );
+ $thumbUrl = '';
+ $status = $this->hitThumbUrl( $file,
$transformParams, $thumbUrl );
wfDebug( __METHOD__ . ": received status
{$status}\n" );
@@ -59,7 +60,7 @@
} elseif ( $status ) {
// Note that this currently happens
(500) when requesting sizes larger then or
// equal to the original, which is
harmless.
- $this->setLastError( __METHOD__ . ':
incorrect HTTP status ' . $status );
+ $this->setLastError( __METHOD__ . ':
incorrect HTTP status ' . $status . ' when hitting ' . $thumbUrl );
return false;
} else {
$this->setLastError( __METHOD__ . ':
HTTP request failure' );
@@ -75,7 +76,7 @@
}
}
- protected function hitThumbUrl( $file, $transformParams ) {
+ protected function hitThumbUrl( $file, $transformParams, &$thumbUrl ) {
global $wgUploadThumbnailRenderHttpCustomHost,
$wgUploadThumbnailRenderHttpCustomDomain;
$thumbName = $file->thumbName( $transformParams );
--
To view, visit https://gerrit.wikimedia.org/r/227453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a1436f1724fcc74d4c1076b21fcdb3b5d58b1de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
