Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169227
Change subject: Revert "Revert "fixup! Send done on error too""
......................................................................
Revert "Revert "fixup! Send done on error too""
This reverts commit 03830b86aaadc00c99ba2157bded0f57fb1a35fb
and reenables b24cae82 on master now that we've deployed.
Change-Id: If267019c53345136f0d3e807a88b4c3e0442382d
---
M api/routes.js
M api/server.js
2 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/27/169227/1
diff --git a/api/routes.js b/api/routes.js
index b6360c4..54c21a3 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -45,13 +45,16 @@
type: "timeout",
timeout: CPU_TIMEOUT
});
- p.then( function() {
+ var self = this;
+ function done(cb) {
process.send({
type: "timeout",
done: true
});
- resolve.apply(this, arguments);
- }, reject );
+ var args = Array.prototype.slice.call(arguments, 1);
+ cb.apply(self, args);
+ }
+ p.then( done.bind(null, resolve), done.bind(null, reject) );
});
};
diff --git a/api/server.js b/api/server.js
index 66b9b99..733eebd 100755
--- a/api/server.js
+++ b/api/server.js
@@ -68,8 +68,10 @@
if ( pid ) {
timeouts.delete( pid );
}
- var worker = cluster.fork();
- worker.on('message', timeoutHandler.bind(null, worker));
+ if ( Object.keys(cluster.workers).length < argv.n ) {
+ var worker = cluster.fork();
+ worker.on('message', timeoutHandler.bind(null, worker));
+ }
};
// Kill cpu hogs
--
To view, visit https://gerrit.wikimedia.org/r/169227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If267019c53345136f0d3e807a88b4c3e0442382d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
