Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240296
Change subject: Fix batch retries and upgrade to request 2.63
......................................................................
Fix batch retries and upgrade to request 2.63
Upgrading request allows multipart form encoding to be done with
this.requestOptions, which fixes the broken retry handling. I'm told
that coveralls will continue to work.
Bug: T113206
Change-Id: Ib667349866ce20b52cdc7688375cb6807dd329f7
---
M lib/mediawiki.ApiRequest.js
M package.json
2 files changed, 6 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/96/240296/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 7ce4a49..4476ec9 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -715,20 +715,15 @@
uri: env.conf.wiki.apiURI,
timeout: env.conf.parsoid.timeouts.mwApi.batch,
};
- var req = this.request(this.requestOptions, this._requestCB.bind(this));
-
// Use multipart form encoding to get more efficient transfer if the
gain
- // will be larger than the typical overhead. In later versions of the
request
- // library, this can easily be done with the formData option, but
coveralls
- // depends on request 2.40.0.
+ // will be larger than the typical overhead.
if (encodeURIComponent(apiargs.batch).length - apiargs.batch.length >
600) {
- var form = req.form();
- for (var optName in apiargs) {
- form.append(optName, apiargs[optName]);
- }
+ this.requestOptions.formData = apiargs;
} else {
- req.form(apiargs);
+ this.requestOptions.form = apiargs;
}
+
+ this.request(this.requestOptions, this._requestCB.bind(this));
}
util.inherits(BatchRequest, ApiRequest);
diff --git a/package.json b/package.json
index d886d62..6dd3c2b 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
"node-uuid": "~1.4.1",
"pegjs": "git+https://github.com/tstarling/pegjs#fork";,
"prfun": "~2.0.0",
- "request": "~2.40.0",
+ "request": "~2.63.0",
"serve-favicon": "~2.3.0",
"simplediff": "~0.1.1",
"yargs": "~1.3.1"
--
To view, visit https://gerrit.wikimedia.org/r/240296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib667349866ce20b52cdc7688375cb6807dd329f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
