jenkins-bot has submitted this change and it was merged.
Change subject: Unlimited listeners; disable the request pool.
......................................................................
Unlimited listeners; disable the request pool.
This ensures that we are in control of our parallelism, and we don't
unexpectedly create deadlocks within the request pool.
Change-Id: Ied7a8e54c38c3adf81571409ece55bb2548258a5
---
M lib/api.js
M lib/image.js
M lib/parsoid.js
M test/samples.js
4 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/api.js b/lib/api.js
index 4547e94..ba714cc 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -26,7 +26,7 @@
}
apiURL = url.resolve(apiURL + '/', 'api.php') + '?' +
querystring.stringify(queryobj);
- return request({ url: apiURL, encoding: 'utf8' }).
+ return request({ url: apiURL, encoding: 'utf8', pool: false }).
spread(function(response, body) {
if (response.statusCode !== 200) {
throw new Error('Unexpected HTTP status: ' +
diff --git a/lib/image.js b/lib/image.js
index 854ac46..302ddfa 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -113,7 +113,7 @@
});
};
- var req = request({ url: realURL, encoding: null }).
+ var req = request({ url: realURL, encoding: null, pool: false }).
on('end', function() {
return deferred.resolve();
}).
diff --git a/lib/parsoid.js b/lib/parsoid.js
index 745199b..4382e34 100644
--- a/lib/parsoid.js
+++ b/lib/parsoid.js
@@ -116,7 +116,7 @@
if (revid) {
apiURL += '?oldid=' + revid;
}
- request({ url: apiURL, encoding: 'utf8' }, function(error, response,
body) {
+ request({ url: apiURL, encoding: 'utf8', pool: false }, function(error,
response, body) {
if (error || response.statusCode !== 200) {
deferred.reject("Error fetching Parsoid result: " +
apiURL);
} else {
diff --git a/test/samples.js b/test/samples.js
index d7c160a..d50770b 100644
--- a/test/samples.js
+++ b/test/samples.js
@@ -18,6 +18,7 @@
describe(name, function() {
it('should bundle', function() {
this.timeout(0);
+ process.setMaxListeners(0);
var filename = path.join(__dirname, '..',
'samples', name);
return P.call(fs.readFile, fs, filename, 'utf8')
.then(function(metabook) {
--
To view, visit https://gerrit.wikimedia.org/r/147181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied7a8e54c38c3adf81571409ece55bb2548258a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
