Skip to content

Commit

Permalink
cluster: add cwd to cluster.settings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
cjihrig authored and evanlucas committed Jan 30, 2018
1 parent 84f8e62 commit 799fd24
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
2 changes: 2 additions & 0 deletions doc/api/cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,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
Expand Down
1 change: 1 addition & 0 deletions lib/internal/cluster/master.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,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,
Expand Down
22 changes: 22 additions & 0 deletions test/parallel/test-cluster-cwd.js
Original file line number Diff line number Diff line change
@@ -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();
}

0 comments on commit 799fd24

Please sign in to comment.