Skip to content

Add support for plugging in a script on the master process. #83

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

Open
richardbowman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for plugging in a script on the master process. #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/daemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function startDaemon(argv) {
var script = argv.shift();
var nodeArgsStr = argv.shift();
var pidFile = argv.shift();
var masterHelperScript = argv.shift();

var naughtLog = null;
var stderrLog = null;
Expand Down Expand Up @@ -190,7 +191,7 @@ function startDaemon(argv) {
var nodeArgs = splitCmdLine(nodeArgsStr);
var stdoutValue = (stdoutBehavior === 'inherit') ? process.stdout : stdoutBehavior;
var stderrValue = (stderrBehavior === 'inherit') ? process.stderr : stderrBehavior;
master = spawn(process.execPath, nodeArgs.concat([path.join(__dirname, "master.js"), workerCount, script]).concat(argv), {
master = spawn(process.execPath, nodeArgs.concat([path.join(__dirname, "master.js"), workerCount, masterHelperScript, script]).concat(argv), {
env: process.env,
stdio: [process.stdin, stdoutValue, stderrValue, 'ipc'],
cwd: process.cwd(),
Expand Down
5 changes: 4 additions & 1 deletion lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ var cmds = {
" --stderr stderr.log\n" +
" --max-log-size 10485760\n" +
" --cwd " + CWD + "\n" +
" --master \n" +
" --daemon-mode true\n" +
" --remove-old-ipc false\n" +
" --node-args ''",
Expand All @@ -62,6 +63,7 @@ var cmds = {
'log': 'naught.log',
'stdout': 'stdout.log',
'stderr': 'stderr.log',
'master': '',
'max-log-size': '10485760',
'cwd': CWD,
'daemon-mode': 'true',
Expand Down Expand Up @@ -381,7 +383,8 @@ function startScript(options, script, argv){
options['max-log-size'],
path.resolve(CWD, script),
options['node-args'],
options['pid-file']
options['pid-file'],
options['master'] ? path.resolve(CWD, options['master']): ""
].concat(argv);
if (options['daemon-mode']) {
startDaemonChild(args);
Expand Down
10 changes: 10 additions & 0 deletions lib/master.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ var Pend = require('pend');

var argv = process.argv.slice(2);
var workerCount = parseInt(argv.shift(), 10);
var customMasterScriptFile = argv.shift();
var customMasterScript;
if (customMasterScriptFile) {
customMasterScript = require(customMasterScriptFile);
}
var script = argv.shift();

var own = {}.hasOwnProperty;
Expand Down Expand Up @@ -164,16 +169,21 @@ function makeWorker(number){
var expectedExit = false;
assert(number>=0);
worker.on('message', onMessage);
if (customMasterScript && customMasterScript.online) {
customMasterScript.online(worker);
}
worker.on('exit', onExit);
if (waitingFor == null) {
// this code activates when a server crashes during normal operations;
// no deploy is in progress
onceOnline(worker, function(){
setWorkerStatus(worker, 'online');
event('WorkerOnline');

if (workers.booting.count === 0) event('Ready');
});
}

return worker;

function onMessage(message){
Expand Down