From c4f80c1f3466eb56f33136ee6e2332335db0ec67 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Sun, 29 May 2016 14:02:22 -0400 Subject: cluster: rewrite debug ports consistently When debug flags are passed to clustered applications, the debug port is rewritten for each worker process to avoid collisions. Prior to this commit, each debug flag would get a unique value. This commit reworks the logic to assign the same port value to all debug flags for a single worker. PR-URL: https://github.com/nodejs/node/pull/7050 Reviewed-By: Ben Noordhuis Reviewed-By: Santiago Gimeno --- lib/cluster.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/cluster.js b/lib/cluster.js index a4b82ca1cc..45cbf5f772 100644 --- a/lib/cluster.js +++ b/lib/cluster.js @@ -299,6 +299,7 @@ function masterInit() { function createWorkerProcess(id, env) { var workerEnv = util._extend({}, process.env); var execArgv = cluster.settings.execArgv.slice(); + var debugPort = 0; workerEnv = util._extend(workerEnv, env); workerEnv.NODE_UNIQUE_ID = '' + id; @@ -309,8 +310,11 @@ function masterInit() { ); if (match) { - const debugPort = process.debugPort + debugPortOffset; - ++debugPortOffset; + if (debugPort === 0) { + debugPort = process.debugPort + debugPortOffset; + ++debugPortOffset; + } + execArgv[i] = match[1] + '=' + debugPort; } } -- cgit v1.2.3