Skip to content

lib: make --debug-port work with cluster #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoordhuis merged 4 commits into from
Jan 12, 2015
Merged

lib: make --debug-port work with cluster #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ec5fd8
test: delete sequential/test-debug-cluster
bnoordhuis Jan 12, 2015
11c1bae
lib: make --debug-port work with cluster
bnoordhuis Jan 12, 2015
3da4f87
test: move sequential/test-debug-signal-cluster
bnoordhuis Jan 12, 2015
c8676cb
test: move sequential/test-debug-port-cluster
bnoordhuis Jan 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ function masterInit() {
workerEnv.NODE_UNIQUE_ID = '' + id;

for (var i = 0; i < execArgv.length; i++) {
var match = execArgv[i].match(/^(--debug|--debug-brk)(=\d+)?$/);
var match = execArgv[i].match(/^(--debug|--debug-(brk|port))(=\d+)?$/);

if (match) {
execArgv[i] = match[1] + '=' + debugPort;
Expand Down
0 test/sequential/test-debug-port-cluster.js → test/parallel/test-debug-port-cluster.js
View file
Open in desktop
File renamed without changes.
16 changes: 9 additions & 7 deletions test/sequential/test-debug-signal-cluster.js → test/parallel/test-debug-signal-cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ var common = require('../common');
var assert = require('assert');
var spawn = require('child_process').spawn;

var args = [ common.fixturesDir + '/clustered-server/app.js' ];
var child = spawn(process.execPath, args, {
stdio: [ 'pipe', 'pipe', 'pipe', 'ipc' ]
});
var port = common.PORT + 42;
var args = ['--debug-port=' + port,
common.fixturesDir + '/clustered-server/app.js'];
var options = { stdio: ['inherit', 'inherit', 'pipe', 'ipc'] };
var child = spawn(process.execPath, args, options);

var outputLines = [];
var outputTimerId;
var waitingForDebuggers = false;
Expand Down Expand Up @@ -83,11 +85,11 @@ process.on('exit', function onExit() {
function assertOutputLines() {
var expectedLines = [
'Starting debugger agent.',
'Debugger listening on port ' + 5858,
'Debugger listening on port ' + (port + 0),
'Starting debugger agent.',
'Debugger listening on port ' + 5859,
'Debugger listening on port ' + (port + 1),
'Starting debugger agent.',
'Debugger listening on port ' + 5860,
'Debugger listening on port ' + (port + 2),
];

// Do not assume any particular order of output messages,
Expand Down
63 changes: 0 additions & 63 deletions test/sequential/test-debug-cluster.js
View file
Open in desktop

This file was deleted.