Mwalker has submitted this change and it was merged.
Change subject: Remove dependency on sleep
......................................................................
Remove dependency on sleep
Change-Id: I4f5a160562b3f6cdf0b353644e87fff283fa55aa
---
M mw-ocg-service.js
M package.json
2 files changed, 6 insertions(+), 9 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
diff --git a/mw-ocg-service.js b/mw-ocg-service.js
index c989058..dccb4af 100755
--- a/mw-ocg-service.js
+++ b/mw-ocg-service.js
@@ -35,7 +35,6 @@
var commander = require('commander');
var os = require('os');
require('rconsole');
-var sleep = require('sleep');
/* === Configuration Options & File ======================================== */
var config = require('./defaults.js');
@@ -89,8 +88,6 @@
/* --- Thread management --- */
var gracefulShutdown = function gracefulShutdown() {
- var stillAlive;
-
respawnWorkers = false;
console.info('Beginning graceful shutdown');
@@ -99,16 +96,17 @@
cluster.workers[id].kill('SIGINT');
}
- do {
- stillAlive = Object.keys(cluster.workers).length;
+ var infoAndExit = function() {
+ var stillAlive = Object.keys(cluster.workers).length;
if (stillAlive > 0) {
console.info('Still awaiting death of %d
workers', stillAlive);
- sleep.sleep(1);
+ setTimeout( infoAndExit, 1000 );
} else {
console.info('All threads killed. Exiting.');
process.exit();
}
- } while (stillAlive > 0);
+ };
+ infoAndExit();
};
var immediateShutdown = function immediateShutdown() {
diff --git a/package.json b/package.json
index d805678..b21bf6f 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,7 @@
"commander": "~2.1.0",
"mime": "~1.2.11",
"rconsole": "~0.2.0",
- "redis": "~0.9.0",
- "sleep": "~1.1.2"
+ "redis": "~0.9.0"
},
"optionalDependencies": {
"hiredis": "~0.1.15"
--
To view, visit https://gerrit.wikimedia.org/r/130511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f5a160562b3f6cdf0b353644e87fff283fa55aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Mwalker <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
