cluster: add cwd to cluster.settings

cjihrig · MylesBorins · commit 47ac3cfb6718 · 2018-08-02T10:48:28.000-04:00
This commit allows cluster workers to be created with configurable working directories. Fixes: #16388 PR-URL: #18399 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/doc/api/cluster.md b/doc/api/cluster.md
@@ -745,6 +745,8 @@ changes:
   * `exec` {string} File path to worker file. **Default:** `process.argv[1]`
   * `args` {Array} String arguments passed to worker.
     **Default:** `process.argv.slice(2)`
+  * `cwd` {string} Current working directory of the worker process. **Default:**
+    `undefined` (inherits from parent process)
   * `silent` {boolean} Whether or not to send output to parent's stdio.
     **Default:** `false`
   * `stdio` {Array} Configures the stdio of forked processes. Because the
diff --git a/lib/internal/cluster/master.js b/lib/internal/cluster/master.js
@@ -129,6 +129,7 @@ function createWorkerProcess(id, env) {
   }
 
   return fork(cluster.settings.exec, cluster.settings.args, {
+    cwd: cluster.settings.cwd,
     env: workerEnv,
     silent: cluster.settings.silent,
     windowsHide: cluster.settings.windowsHide,
diff --git a/test/parallel/test-cluster-cwd.js b/test/parallel/test-cluster-cwd.js
@@ -0,0 +1,22 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const cluster = require('cluster');
+
+if (cluster.isMaster) {
+  common.refreshTmpDir();
+
+  assert.strictEqual(cluster.settings.cwd, undefined);
+  cluster.fork().on('message', common.mustCall((msg) => {
+    assert.strictEqual(msg, process.cwd());
+  }));
+
+  cluster.setupMaster({ cwd: common.tmpDir });
+  assert.strictEqual(cluster.settings.cwd, common.tmpDir);
+  cluster.fork().on('message', common.mustCall((msg) => {
+    assert.strictEqual(msg, common.tmpDir);
+  }));
+} else {
+  process.send(process.cwd());
+  process.disconnect();
+}

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ function createWorkerProcess(id, env) {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`return fork(cluster.settings.exec, cluster.settings.args, {`
	`132`	`+ cwd: cluster.settings.cwd,`
`132`	`133`	`env: workerEnv,`
`133`	`134`	`silent: cluster.settings.silent,`
`134`	`135`	`windowsHide: cluster.settings.windowsHide,`