Skip to content

Commit

Permalink
[fix] inherits configuration from parent process when using `startDae…
Browse files Browse the repository at this point in the history
…mon` method. - make variable names camelCasing
  • Loading branch information
Tjatse committed Oct 30, 2014
1 parent 1f9b7f7 commit a74e87c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bin/monitor
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ process.on('message', function (data) {
var options = JSON.parse(data.toString());

// inherits configuration from parent process if exists.
options && options.__loaded_options && (forever.load(options.__loaded_options), delete options.__loaded_options);
options && options._loadedOptions && (forever.load(options._loadedOptions), delete options._loadedOptions);

if (!started) {
started = true;
Expand Down
4 changes: 2 additions & 2 deletions lib/forever.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function stopOrRestart(action, event, format, target) {
//
forever.load = function (options) {
// memorize current options.
this.__loaded_options = options;
this._loadedOptions = options;

//
// Setup the incoming options with default options.
Expand Down Expand Up @@ -414,7 +414,7 @@ forever.startDaemon = function (script, options) {
});

// transmit options to daemonic(child) process, keep configuration lineage.
options.__loaded_options = this.__loaded_options;
options._loadedOptions = this._loadedOptions;

monitor.send(JSON.stringify(options));

Expand Down

0 comments on commit a74e87c

Please sign in to comment.