jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383391 )
Change subject: Don't request render if renderer not configured
......................................................................
Don't request render if renderer not configured
If $mwCollectionMWServeURL is falsy, then don't try make an HTTP request
to the rendering backend. Instead, log a helpful message to the
"collection" log group.
Bug: T177795
Change-Id: Ia33e7f72b4d3cbbea6c8e939ea80ef05c179648f
(cherry picked from commit 2fef1600479c2f288ba973996fd984d346903b6c)
---
M RenderingAPI.php
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RenderingAPI.php b/RenderingAPI.php
index 397872d..2593416 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -301,14 +301,22 @@
// If $serveURL has a | in it, we need to use a proxy.
list( $proxy, $serveURL ) = array_pad( explode( '|', $serveURL,
2 ), -2, '' );
+ if ( !$serveURL ) {
+ wfDebugLog( 'collection', 'The mwlib/OCG render server
URL isn\'t configured.' );
+
+ return new CollectionAPIResult( false );
+ }
+
$response = Http::post(
$serveURL,
[ 'postData' => $params, 'proxy' => $proxy ],
__METHOD__
);
+
if ( $response === false ) {
wfDebugLog( 'collection', "Request to $serveURL
resulted in error" );
}
+
return new CollectionAPIResult( $response );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/383391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia33e7f72b4d3cbbea6c8e939ea80ef05c179648f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: C. Scott Ananian <canan...@wikimedia.org>
Gerrit-Reviewer: Phuedx <samsm...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
