Browse Source

Force exit on SIGINT but still reset flags on stdio fds

Add test that one can ctrl+c out of a script spinning infinitely.
v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
ceb5331a64
  1. 3
      src/node.cc
  2. 36
      test/simple/test-sigint-infinite-loop.js

3
src/node.cc

@ -1776,7 +1776,8 @@ static void AtExit() {
static void SignalExit(int signal) {
ev_unloop(EV_DEFAULT_ EVUNLOOP_ALL);
AtExit();
exit(1);
}

36
test/simple/test-sigint-infinite-loop.js

@ -0,0 +1,36 @@
// This test is to assert that we can SIGINT a script which loops forever.
// ref: http://groups.google.com/group/nodejs-dev/browse_thread/thread/e20f2f8df0296d3f
var common = require('../common');
var assert = require('assert');
var spawn = require('child_process').spawn;
console.log("start");
var c = spawn(process.execPath, ['-e', 'while(true) { console.log("hi"); }']);
var sentKill = false;
var gotChildExit = true;
c.stdout.on('data', function (s) {
// Prevent race condition:
// Wait for the first bit of output from the child process
// so that we're sure that it's in the V8 event loop and not
// just in the startup phase of execution.
if (!sentKill) {
c.kill('SIGINT')
console.log("SIGINT infinite-loop.js");
sentKill = true;
}
});
c.on('exit', function (code) {
assert.ok(code !== 0);
console.log("killed infinite-loop.js");
gotChildExit = true;
});
process.on('exit', function () {
assert.ok(sentKill);
assert.ok(gotChildExit);
});
Loading…
Cancel
Save