Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/136739
Change subject: Increase api timeout for publishing, better error handling for publishing ...................................................................... Increase api timeout for publishing, better error handling for publishing * Increased the ajax timeout for the publishing 100*1000 milliseconds * Increase the parsoid http response timeout to 100*1000 milliseconds * Pass the exception details from parsoid api call to client instead of hardcoded string. Change-Id: I8303db0f6db31fc21ea04a506e40e2fbbcaee891 --- M ContentTranslation.php M api/ApiContentTranslationPublish.php M modules/translation/ext.cx.publish.js 3 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/39/136739/1 diff --git a/ContentTranslation.php b/ContentTranslation.php index 2b92c38..9939917 100644 --- a/ContentTranslation.php +++ b/ContentTranslation.php @@ -50,7 +50,7 @@ $GLOBALS['wgContentTranslationParsoid'] = array( 'url' => 'http://parsoid.wmflabs.org/', - 'timeout' => 15, + 'timeout' => 100*1000, // Parsoid timeout in milliseconds 'prefix' => 'enwiki', ); diff --git a/api/ApiContentTranslationPublish.php b/api/ApiContentTranslationPublish.php index 8edf224..820f990 100644 --- a/api/ApiContentTranslationPublish.php +++ b/api/ApiContentTranslationPublish.php @@ -82,7 +82,7 @@ try { $wikitext = $this->convertHtmlToWikitext( $title, $params['html'] ); } catch ( MWException $e ) { - $this->dieUsage( 'Conversion to wikitext with parsoid failed', 'parsoidserver' ); + $this->dieUsage( $e->getMessage(), 'parsoidserver' ); } $saveresult = $this->saveWikitext( $title, $wikitext, $params ); diff --git a/modules/translation/ext.cx.publish.js b/modules/translation/ext.cx.publish.js index c8ae9d2..5c01392 100644 --- a/modules/translation/ext.cx.publish.js +++ b/modules/translation/ext.cx.publish.js @@ -70,11 +70,15 @@ function publishTranslation( title, content, sourceTitle ) { var api = new mw.Api(); - return api.postWithEditToken( { + return api.postWithToken( 'edit', { action: 'cxpublish', title: title, html: content, sourcetitle: sourceTitle + }, { + // A bigger timeout since publishing after converting html to wikitext + // parsoid is not a fast operation. + timeout: 100 * 1000 // in milliseconds } ); } -- To view, visit https://gerrit.wikimedia.org/r/136739 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8303db0f6db31fc21ea04a506e40e2fbbcaee891 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits