Skip to content

Commit

Permalink
debugger: improve ESRCH error message
Browse files Browse the repository at this point in the history
When use `iojs debug -p <pid>` with an invalid pid,
the debugger print internal error message also,
it not enough smart.
  • Loading branch information
JacksonTian committed Jun 5, 2015
1 parent 6d95f4f commit cec83f7
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 3 deletions.
15 changes: 12 additions & 3 deletions lib/_debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,16 @@ Interface.prototype.trySpawn = function(cb) {
} else if (this.args.length === 3) {
// `node debug -p pid`
if (this.args[1] === '-p' && /^\d+$/.test(this.args[2])) {
process._debugProcess(parseInt(this.args[2], 10));
const pid = parseInt(this.args[2], 10);
try {
process._debugProcess(pid);
} catch (e) {
if (e.code === 'ESRCH') {
console.error('Target process: ' + pid + ' doesn\'t exist.');
process.exit(1);
}
throw e;
}
isRemote = true;
} else {
var match = this.args[1].match(/^--port=(\d+)$/);
Expand Down Expand Up @@ -1704,8 +1713,8 @@ Interface.prototype.trySpawn = function(cb) {
function connectError() {
// If it's failed to connect 10 times then print failed message
if (connectionAttempts >= 10) {
self.stdout.write(' failed, please retry\n');
return;
console.error(' failed, please retry');
process.exit(1);
}
setTimeout(attemptConnect, 500);
}
Expand Down
39 changes: 39 additions & 0 deletions test/debugger/test-debugger-pid.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
'use strict';
var common = require('../common');
var assert = require('assert');
var spawn = require('child_process').spawn;

var port = common.PORT + 1337;
var buffer = '';
var expected = [];
var scriptToDebug = common.fixturesDir + '/empty.js';

function fail() {
assert(0); // `--debug-brk script.js` should not quit
}

// connect to debug agent
var interfacer = spawn(process.execPath, ['debug', '-p', '655555']);

console.error(process.execPath, 'debug', '-p', '655555');
interfacer.stdout.setEncoding('utf-8');
interfacer.stderr.setEncoding('utf-8');
var onData = function (data) {
data = (buffer + data).split('\n');
buffer = data.pop();
data.forEach(function(line) {
interfacer.emit('line', line);
});
};
interfacer.stdout.on('data', onData);
interfacer.stderr.on('data', onData);

interfacer.on('line', function(line) {
line = line.replace(/^(debug> *)+/, '');
var expected = 'Target process: 655555 doesn\'t exist.';
assert.ok(expected == line, 'Got unexpected line: ' + line);
});

interfacer.on('exit', function (code, signal) {
assert.ok(code == 1, 'Got unexpected code: ' + code);
});

0 comments on commit cec83f7

Please sign in to comment.