jenkins-bot has submitted this change and it was merged.
Change subject: Lower timeout of upload stash -> image scaler requests
......................................................................
Lower timeout of upload stash -> image scaler requests
This should let us establish if something higher in the chain of requests
is timing out too early compared to this internal request. The default of
25 seconds seems unreasonable anyway for a regular web request.
Bug: T90599
Change-Id: I06dbf25cd2b1a664ff18682ecbbd73719113d36d
---
M includes/specials/SpecialUploadStash.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialUploadStash.php
b/includes/specials/SpecialUploadStash.php
index 4a92bb9..87e7063 100644
--- a/includes/specials/SpecialUploadStash.php
+++ b/includes/specials/SpecialUploadStash.php
@@ -250,7 +250,7 @@
// make a curl call to the scaler to create a thumbnail
$httpOptions = array(
'method' => 'GET',
- 'timeout' => 'default'
+ 'timeout' => 5 // T90599 attempt to time out cleanly
);
$req = MWHttpRequest::factory( $scalerThumbUrl, $httpOptions,
__METHOD__ );
$status = $req->execute();
--
To view, visit https://gerrit.wikimedia.org/r/197284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06dbf25cd2b1a664ff18682ecbbd73719113d36d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf21
Gerrit-Owner: Gilles <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
