Skip to content

Commit

Permalink
debugger: propagate --debug-port= to debuggee
Browse files Browse the repository at this point in the history
Before this commit `node --debug-port=1234 debug t.js` ignored the
--debug-port= argument, binding to the default port 5858 instead,
making it impossible to debug more than one process on the same
machine that way.

This commit also reduces the number of places where the default port
is hard-coded by one.

Fixes: #3345
PR-URL: #3470
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
bnoordhuis authored and rvagg committed Jun 2, 2016
1 parent bf3afce commit 2184e77
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/_debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ exports.start = function(argv, stdin, stdout) {
stdin = stdin || process.stdin;
stdout = stdout || process.stdout;

const args = ['--debug-brk'].concat(argv);
const args = [`--debug-brk=${exports.port}`].concat(argv);
const interface_ = new Interface(stdin, stdout, args);

stdin.resume();
Expand All @@ -41,7 +41,7 @@ exports.start = function(argv, stdin, stdout) {
});
};

exports.port = 5858;
exports.port = process.debugPort;


//
Expand Down
41 changes: 41 additions & 0 deletions test/parallel/test-debug-port-numbers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const path = require('path');
const spawn = require('child_process').spawn;

const children = [];
for (let i = 0; i < 4; i += 1) {
const port = common.PORT + i;
const args = [`--debug-port=${port}`, '--interactive', 'debug', __filename];
const child = spawn(process.execPath, args, { stdio: 'pipe' });
child.test = { port: port, stdout: '' };
child.stdout.setEncoding('utf8');
child.stdout.on('data', function(s) { child.test.stdout += s; update(); });
child.stdout.pipe(process.stdout);
child.stderr.pipe(process.stderr);
children.push(child);
}

function update() {
// Debugger prints relative paths except on Windows.
const filename = path.basename(__filename);

let ready = 0;
for (const child of children)
ready += RegExp(`break in .*?${filename}:1`).test(child.test.stdout);

if (ready === children.length)
for (const child of children)
child.kill();
}

process.on('exit', function() {
for (const child of children) {
const one = RegExp(`Debugger listening on port ${child.test.port}`);
const two = RegExp(`connecting to 127.0.0.1:${child.test.port}`);
assert(one.test(child.test.stdout));
assert(two.test(child.test.stdout));
}
});

0 comments on commit 2184e77

Please sign in to comment.