Skip to content

Commit

Permalink
[fix] Improve the ordering of options parsing and include some option…
Browse files Browse the repository at this point in the history
…s missed on the reparse. Fixes #139
  • Loading branch information
indexzero committed Dec 2, 2011
1 parent 76b4d96 commit 0e7873b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/forever.js
Expand Up @@ -488,11 +488,11 @@ forever.restart = function (target, format) {
'start',
'--sourceDir', proc.sourceDir,
'-l', proc.logFile,
'--append'
'--append true'
];

if (proc.silent) {
restartCommand.push('--silent');
restartCommand.push('--silent true');
}

if (proc.outFile) {
Expand Down
8 changes: 4 additions & 4 deletions lib/forever/cli.js
Expand Up @@ -91,7 +91,7 @@ var argvOptions = {
'plain': {boolean: true}
};

app.config.argv(argvOptions).env();
app.config.argv().env();

var reserved = ['root', 'pidPath'];

Expand Down Expand Up @@ -170,12 +170,12 @@ function getOptions(file) {
// we've removed some before.
//
app.config.stores.argv.store = {};
app.config.use('argv');
app.config.use('argv', argvOptions);

[
'pidFile', 'logFile', 'errFile', 'watch', 'minUptime', 'appendLog',
'silent', 'max', 'command', 'path', 'spinSleepTime', 'sourceDir',
'uid'
'silent', 'outFile', 'max', 'command', 'path', 'spinSleepTime',
'sourceDir', 'uid'
].forEach(function (key) {
options[key] = app.config.get(key);
});
Expand Down

0 comments on commit 0e7873b

Please sign in to comment.