jenkins-bot has submitted this change and it was merged.
Change subject: Update cluster API to node 0.8; remove node 0.6-compatibility
code.
......................................................................
Update cluster API to node 0.8; remove node 0.6-compatibility code.
The 'death' event was renamed to 'exit' in node 0.8.
We have dependencies that no longer work on node 0.6, so go ahead and
remove the node 0.6-compatibility barnacles while we're updating this.
Bug: 49599
Change-Id: I2b7119c928ed27e26181c67c6d300f526cd53801
---
M js/api/server.js
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/api/server.js b/js/api/server.js
index e85834d..79df13a 100755
--- a/js/api/server.js
+++ b/js/api/server.js
@@ -17,17 +17,18 @@
cluster.fork();
}
- cluster.on('death', function(worker) {
- if(!worker.suicide) {
- console.log('worker ' + worker.pid + ' died, restarting.');
- // restart worker
+ cluster.on('exit', function(worker, code, signal) {
+ if (!worker.suicide) {
+ var exitCode = worker.process.exitCode;
+ console.log('worker', worker.process.pid,
+ 'died ('+exitCode+'), restarting.');
cluster.fork();
}
});
+
process.on('SIGTERM', function() {
console.log('master shutting down, killing workers');
var workers = cluster.workers;
- if (!workers) { throw new Error("Force killing node 0.6.x"); }
Object.keys(workers).forEach(function(id) {
console.log('Killing worker ' + id);
workers[id].destroy();
--
To view, visit https://gerrit.wikimedia.org/r/69151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b7119c928ed27e26181c67c6d300f526cd53801
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
