Merge pull request #1 from elliotttf/config

Config

.eslintignore

@@ -0,0 +1,2 @@
+coverage
+newrelic.js

.eslintrc

@@ -8,7 +8,6 @@
     "block-scoped-var": 2,
     "camelcase": 2,
     "comma-dangle": [2, "never"],
-    "comma-dangle": 2,
     "complexity": 2,
     "consistent-return": 2,
     "curly": 2,
@@ -19,6 +18,7 @@
     "eqeqeq": 2,
     "guard-for-in": 2,
     "indent": [2, 2],
+    "keyword-spacing": 2,
     "no-alert": 2,
     "no-caller": 2,
     "no-div-regex": 2,
@@ -64,7 +64,6 @@
     "no-warning-comments": 1,
     "quotes": [2, "single"],
     "radix": 2,
-    "space-after-keywords": [2, "always"],
     "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
     "space-infix-ops": 2,
     "object-curly-spacing": [2, "never"],

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
+sudo: false
 node_js:
-  - "4.2"
+  - "4"
   - "node"
-after_success: gulp coveralls
+script: npm run lint && npm test && npm run coverage
+after_success: npm run coveralls
 

lib/master.js

@@ -26,16 +26,19 @@ function eachWorker(cb) {
  * SIGINT and allows them tiem to shut down. If a work has not shut down after
  * 10 seconds it will be forcekilled. After all workers have disconnected or
  * been killed the process will exit.
+ *
+ * @param {int} killTimeout
+ *   Time in milliseconds to wait before forcefully killing a child process.
  */
-function sigint() {
+function sigint(killTimeout) {
   let shutdowns = eachWorker(worker => new Promise(resolve => {
     let timeout = setTimeout(() => {
       if (workerSockets[worker.process.pid]) {
         workerSockets[worker.process.pid].end();
       }
       worker.kill();
       resolve();
-    }, 10000);
+    }, killTimeout);
     worker.on('disconnect', () => {
       if (workerSockets[worker.process.pid]) {
         workerSockets[worker.process.pid].end();
@@ -78,18 +81,24 @@ module.exports = {
    *
    * @param {string} path
    *   (optional) The socket path to use. Defaults to /var/run/adios.sock
+   * @param {object} config
+   *   (optional) A configuration object for the master process. Contains:
+   *   - timeout: time in milliseconds before a child will be force closed.
+   *     Default: 10000, 10 seconds.
    *
    * @return {Promise}
    *   Resolves when the server is listening.
    */
-  init(path) {
+  init(path, config) {
     if (!cluster.isMaster) {
       throw new Error('Adios master must be initialized from a master process');
     }
     else if (server) {
       throw new Error('Adios can only be initialized once per process');
     }
 
+    const timeout = (config && config.timeout) || 10000;
+
     return new Promise(resolve => {
       server = net.createServer(c => {
         let pid;
@@ -109,7 +118,7 @@ module.exports = {
       });
       server.listen(path || DEFAULT_PATH, resolve);
 
-      process.on('SIGINT', sigint);
+      process.on('SIGINT', () => sigint(timeout));
       process.on('SIGTERM', sigterm);
     });
   },
@@ -122,8 +131,8 @@ module.exports = {
    *   Resolves when the server has been destroyed.
    */
   destroy() {
-    process.removeListener('SIGINT', sigint);
-    process.removeListener('SIGTERM', sigterm);
+    process.removeAllListeners('SIGINT');
+    process.removeAllListeners('SIGTERM');
     workerSockets = {};
 
     if (server) {

package.json

@@ -1,11 +1,13 @@
 {
   "name": "adios",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A simple module for handling shutdowns within a clustered application.",
   "main": "lib/adios.js",
   "scripts": {
-    "test": "gulp test",
-    "lint": "gulp lint"
+    "test": "istanbul cover --print both nodeunit ./test/index.js",
+    "lint": "eslint .",
+    "coverage": "istanbul check-coverage --statements 100 --lines 100 --branches 81 --functions 100",
+    "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
   "repository": {
     "type": "git",
@@ -21,12 +23,11 @@
     "node": ">= 4.2"
   },
   "devDependencies": {
+    "coveralls": "^2.11.6",
+    "eslint": "^2.2.0",
     "ghooks": "^1.0.1",
-    "gulp": "^3.9.0",
-    "gulp-coveralls": "^0.1.4",
-    "gulp-eslint": "^1.1.1",
-    "gulp-istanbul": "^0.10.3",
-    "gulp-nodeunit": "0.0.5",
+    "istanbul": "^0.4.2",
+    "nodeunit": "^0.9.1",
     "sinon": "^1.17.2"
   },
   "config": {

test/index.js

@@ -8,9 +8,10 @@ const Adios = require('../');
 module.exports = {
   setUp(cb) {
     this.stubs = [];
+    this.testSock = path.join(os.tmpDir(), `${Date.now()}-adios.sock`);
+
     this.clock = sinon.useFakeTimers();
     this.origMaster = cluster.isMaster;
-    this.testSock = path.join(os.tmpDir(), `${Date.now()}-adios.sock`);
     cb();
   },
   tearDown(cb) {

test/master.js

@@ -135,14 +135,14 @@ module.exports = {
       util.inherits(DummyWorker, EventEmitter);
       DummyWorker.prototype.disconnect = function () {
         test.ok(true, 'Disconnect called');
-        this.clock.tick(10000);
+        this.clock.tick(1);
       }.bind(this);
       DummyWorker.prototype.kill = function () {
         test.ok(true, 'Kill called');
       };
       cluster.workers.foo = new DummyWorker();
 
-      Adios.master.init(this.testSock)
+      Adios.master.init(this.testSock, {timeout: 1})
         .then(() => {
           let conn = net.connect(this.testSock, () => {
             conn.write('pid:foo', () => {