Merge pull request #155 from strongloop/update

[semver-major] Update supported Node versions

Author: bajtos

.travis.yml

@@ -1,7 +1,5 @@
 language: node_js
 node_js:
+  - "10"
+  - "8"
   - "6"
-  - "5"
-  - "4"
-  - "0.12"
-  - "0.10"

appveyor.yml

@@ -1,10 +1,8 @@
 environment:
   matrix:
+    - nodejs_version: '10'
+    - nodejs_version: '8'
     - nodejs_version: '6'
-    - nodejs_version: '5'
-    - nodejs_version: '4'
-    - nodejs_version: '0.12'
-    - nodejs_version: '0.10'
 install:
   - ps: Install-Product node $env:nodejs_version
   - set CI=true

lib/proc.js

@@ -29,6 +29,7 @@ function run(key, proc, emitter) {
     args = ['-c', proc.command];
   }
   var child = prog.spawn(file, args, { env: proc.env });
+  var killallReceived = false;
 
   child.stdout.on('data', function(data) {
     cons.log(key, proc, data.toString());
@@ -38,20 +39,35 @@ function run(key, proc, emitter) {
     cons.log(key, proc, data.toString());
   });
 
-  child.on('close', function(code) {
+  child.on('close', function(code, signal) {
     if(code === 0) {
       cons.info(key, proc, "Exited Successfully");
     } else {
-      cons.error(key, proc, "Exited with exit code " + code);
+      cons.error(key, proc, "Exited with exit code " + signal || code);
     }
   });
 
   child.on('exit', function(code, signal) {
-    emitter.emit('killall', signal);
+    if (!killallReceived) {
+      emitter.emit('killall', signal || 'SIGINT');
+    }
   });
 
   emitter.on('killall', function(signal) {
-    child.kill(signal);
+    // Once this process has received a killall event, don't send another
+    // such event to everyone. Let's assume that once is enough.
+    killallReceived = true;
+
+    try {
+      child.kill(signal);
+    }
+    catch (err) {
+      if (err.code === 'EPERM') {
+        // Means that the child runs with higher privileges than we are; we're
+        // not going to be able to kill it in that state. Log and do nothing.
+        cons.error(key, proc, "Process has become unkillable; returns EPERM.");
+      }
+    }
   });
 
 }

package.json

@@ -26,10 +26,10 @@
     "test": "tap test/*.test.*"
   },
   "dependencies": {
-    "commander": "~2.9.0",
-    "http-proxy": "~1.11.1",
+    "commander": "^2.15.1",
+    "http-proxy": "^1.17.0",
     "mustache": "^2.2.1",
-    "shell-quote": "~1.4.2"
+    "shell-quote": "^1.6.1"
   },
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
     "email": "[email protected]"
   },
   "engines": {
-    "node": ">=0.6.9"
+    "node": ">=6"
   },
   "preferGlobal": true,
   "devDependencies": {

test/exit-with-code-gracefully.test.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+NF="node ../nf.js"
+
+rm -rf sandbox
+mkdir -p sandbox
+
+# We'll exit with a code that cannot be used as a signal. This exposes a
+# potential bug in termination handling.
+printf "exitwithcode: sleep 0.1; exit 132" > sandbox/Procfile
+node ../nf.js --procfile sandbox/Procfile start >sandbox/signals.txt 2>&1 && exit 0
+
+exit 1
+

test/handle-eperm.test.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+NF="node ../nf.js"
+
+rm -rf sandbox
+mkdir -p sandbox
+
+# We'll exit with a code that cannot be used as a signal. This exposes a
+# potential bug in termination handling.
+printf "exitwithcode: sudo sleep 1\ncrashafterawhile: sleep 0.5; exit 123" > sandbox/Procfile
+node ../nf.js --procfile sandbox/Procfile start >sandbox/eperm.txt 2>&1 && exit 0
+
+exit 1
+