[fix] Small fixes found from some upstream integrations

lib/forever/monitor.js

@@ -28,7 +28,7 @@ var Monitor = exports.Monitor = function (script, options) {
   this.forever    = options.forever || false;
   this.command    = options.command || 'node';
   this.sourceDir  = options.sourceDir;
-  this.minUptime  = options.minUptime || 2000;
+  this.minUptime  = typeof options.minUptime !== 'number' ? 2000 : options.minUptime;
   this.options    = options.options || [];
   this.spawnWith  = options.spawnWith || null;
   this.uid        = options.uid || forever.randomString(24);
@@ -100,15 +100,15 @@ Monitor.prototype.start = function (restart) {
   this.child = child;
   this.running = true;
 
-  this.once('save', function () {
-    self.emit(restart ? 'restart' : 'start', self);
+  this.once('save', function (file, data) {
+    self.emit(restart ? 'restart' : 'start', self, file, data);
   });
 
   this.save();
 
   // Hook all stream data and process it
   function listenTo (stream) {
-    child[stream].on('data', function ldata (data) {
+    function ldata (data) {
       if (!self.silent && !self[stream]) {
         //
         // If we haven't been silenced, and we don't have a file stream
@@ -124,7 +124,9 @@ Monitor.prototype.start = function (restart) {
       }
 
       self.emit(stream, data);
-    });
+    }
+
+    child[stream].on('data', ldata);
 
     child.on('exit', function () {
       child[stream].removeListener('data', ldata);
@@ -138,9 +140,9 @@ Monitor.prototype.start = function (restart) {
   child.on('exit', function (code) {
     var spinning = Date.now() - self.ctime < self.minUptime;
     self.warn('Forever detected script exited with code: ' + code);
-    self.times++;
-
+
     if ((self.forever || self.times < self.max) && !self.forceStop && !spinning) {
+      self.times++;
       process.nextTick(function () {
         self.warn('Forever restarting script for ' + self.times + ' time');
         self.start(true);