#2956 timeout

Author: Unitech

lib/God.js

@@ -227,11 +227,11 @@ God.executeApp = function executeApp(env, cb) {
       var old_env = God.clusters_db[clu.pm2_env.pm_id];
       if (old_env) old_env = null;
 
-      var proc = God.clusters_db[env_copy.pm_id] = clu;
+      God.clusters_db[env_copy.pm_id] = clu;
 
       clu.once('error', function cluError(err) {
         console.error(err.stack || err);
-        proc.pm2_env.status = cst.ERRORED_STATUS;
+        clu.pm2_env.status = cst.ERRORED_STATUS;
         try {
           clu.kill && clu.kill();
         }
@@ -245,7 +245,7 @@ God.executeApp = function executeApp(env, cb) {
         if (clu.connected === true)
           clu.disconnect && clu.disconnect();
         clu._reloadLogs = null;
-        return God.handleExit(proc, code || 0, signal);
+        return God.handleExit(clu, code || 0, signal);
       });
 
       if (!clu.pm2_env.wait_ready)
@@ -259,8 +259,8 @@ God.executeApp = function executeApp(env, cb) {
 
       var listener = function (packet) {
         if (packet.raw === 'ready' &&
-            packet.process.name === proc.pm2_env.name &&
-            packet.process.pm_id === proc.pm2_env.pm_id) {
+            packet.process.name === clu.pm2_env.name &&
+            packet.process.pm_id === clu.pm2_env.pm_id) {
           clearTimeout(ready_timeout);
           God.bus.removeListener('process:msg', listener)
           return readyCb(clu)

test/programmatic/graceful.mocha.js

@@ -39,7 +39,7 @@ describe('Wait ready / Graceful start / restart', function() {
         pm2.list(function(err, apps) {
           should(apps[0].pm2_env.status).eql('launching');
         });
-      }, 200);
+      }, 800);
 
       setTimeout(function() {
         pm2.list(function(err, apps) {
@@ -128,7 +128,7 @@ describe('Wait ready / Graceful start / restart', function() {
         pm2.list(function(err, apps) {
           should(apps[0].pm2_env.status).eql('launching');
         });
-      }, 200);
+      }, 800);
 
       setTimeout(function() {
         pm2.list(function(err, apps) {