1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debugger: improve ESRCH error message

Browse Source 
When using `iojs debug -p <pid>` with an invalid pid, the debugger
printed an internal error message because it wasn't smart enough
to figure out that the target process didn't exist.  Now it is.

PR-URL: https://github.com/nodejs/io.js/pull/1863
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Yosuke Furukawa <yosuke.furukawa@gmail.com>
This commit is contained in:
Jackson Tian 2015-06-01 22:12:25 +08:00 committed by Ben Noordhuis
parent 353e26e3c7
commit 81029c639a
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/_debugger.js
View File

@ -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+)$/);
@ -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);
}

39
test/debugger/test-debugger-pid.js Normal file
View File

@ -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);
});