Merge branch 'cleanup' into pre_prod

Author: rahulnwn

bin/cli.js

@@ -23,30 +23,46 @@ var Log = require('../lib/logger'),
     logLevel,
     tunnel;
 
-function cleanUp(signal) {
-  try {
-    server.close();
-  } catch (e) {
-    logger.debug("Server already closed");
-  }
-
-  logger.info("Exiting");
-
-  for (var key in workers) {
-    var worker = workers[key];
-    if (workers.hasOwnProperty(key)) {
-      client.terminateWorker(worker.id, function () {
-        if (!workers[key]) {
-          return;
-        }
-
+function terminateAllWorkers(callback) {
+  var cleanWorker = function(id, key) {
+    client.terminateWorker(id, function() {
+      var worker = workers[key];
+      if(worker) {
         logger.debug('[%s] Terminated', worker.string);
         clearTimeout(worker.activityTimeout);
         delete workers[key];
         delete workerKeys[worker.id];
-      });
+      }
+      if (utils.objectSize(workers) === 0) {
+        callback();
+      }
+    });
+  };
+
+  if (utils.objectSize(workers) === 0) {
+    callback();
+  } else {
+    for (var key in workers){
+      var worker = workers[key];
+      if (worker.id) {
+        cleanWorker(worker.id, key);
+      } else {
+        delete workers[key];
+        if (utils.objectSize(workers) === 0) {
+          callback();
+        }
+      }
     }
   }
+};
+
+function cleanUpAndExit(signal, status) {
+  try {
+    server.close();
+  } catch (e) {
+    logger.debug("Server already closed");
+  }
+
   if (statusPoller) statusPoller.stop();
 
   try {
@@ -59,8 +75,15 @@ function cleanUp(signal) {
   } catch (e) {
     logger.debug("Non existent pid file.");
   }
-  if (signal) {
-    process.kill(process.pid, 'SIGTERM');
+
+  if (signal == 'SIGTERM') {
+    logger.info("Exiting");
+    process.exit(status);
+  } else {
+    terminateAllWorkers(function() {
+      logger.info("Exiting");
+      process.exit(1);
+    });
   }
 }
 
@@ -187,7 +210,7 @@ var statusPoller = {
                     config.status = 1;
                   }
 
-                  process.exit(config.status);
+                  process.kill(process.pid, 'SIGTERM');
                 }
               }
             }, activityTimeout * 1000);
@@ -208,7 +231,7 @@ var statusPoller = {
                     config.status = 1;
                   }
 
-                  process.exit(config.status);
+                  process.kill(process.pid, 'SIGTERM');
                 }
               }
             }, (activityTimeout * 1000));
@@ -262,8 +285,8 @@ try {
     runTests();
     var pid_file = process.cwd() + '/browserstack-run.pid';
     fs.writeFileSync(pid_file, process.pid, 'utf-8')
-    process.on('exit', function() {cleanUp(false)});
-    process.on('SIGINT', function() {cleanUp(true)});
+    process.on('SIGINT', function() { cleanUpAndExit('SIGINT', 1) });
+    process.on('SIGTERM', function() { cleanUpAndExit('SIGTERM', config.status) });
   }
 } catch (e) {
   console.log(e);

lib/local.js

@@ -29,9 +29,9 @@ var Tunnel = function Tunnel(key, port, uniqueIdentifier, callback, err) {
       logger.debug(stderr);
       logger.debug(error);
       if (stdout.indexOf('Error') >= 0 || error) {
-        logger.info("[%s] Tunnel launching failed", new Date());
-        logger.info(stdout);
-        process.exit(1);
+        logger.debug("[%s] Tunnel launching failed", new Date());
+        logger.debug(stdout);
+        process.kill(process.pid, 'SIGINT');
       }
     });
 
@@ -82,7 +82,7 @@ var Tunnel = function Tunnel(key, port, uniqueIdentifier, callback, err) {
         }, 100);
       }).on('error', function(e) {
         logger.info("Got error while downloading binary: " + e.message);
-        process.exit(1);
+        process.kill(process.pid, 'SIGINT');
       });
     });
   });

lib/server.js

@@ -208,7 +208,7 @@ exports.Server = function Server(bsClient, workers) {
                 config.status = 1;
               }
 
-              process.exit(config.status);
+              process.kill(process.pid, 'SIGTERM');
             }
           });
         });

lib/utils.js

@@ -49,7 +49,7 @@ var alertBrowserStack = function alertBrowserStack(subject, content, params, fn)
     if (typeof params === 'function') {
     } else {
       fn = function() {
-        process.exit(1);
+        process.kill(process.pid, 'SIGINT');
       };
     }
   }