Various fixues: Handle worker/tunnel errors

Author: Rohan Jain

bin/runner.js

@@ -31,7 +31,13 @@ var cleanUp = function cleanUp () {
   for (var key in workers) {
     if (workers.hasOwnProperty(key)) {
       client.terminateWorker(workers[key].id, function () {
+        if (!workers[key]) {
+          return;
+        }
+
         console.log('[%s] Terminated', workers[key].string);
+        clearTimeout(workers[key].activityTimeout);
+        delete workers[key]
       });
     }
   }
@@ -82,27 +88,34 @@ function launchBrowser(browser) {
   }
 
   client.createWorker(browser, function (err, worker) {
-    var runningChecked = false;
+    if (err || typeof worker !== 'object') {
+      utils.alertBrowserStack("Failed to launch worker",
+                              "Arguments: " + JSON.stringify({
+                                err: err,
+                                worker: worker
+                              }, null, 4));
+      return;
+    }
 
     worker.config = browser;
     worker.string = browserString;
     workers[key] = worker;
 
     var statusPoller = setInterval(function () {
       client.getWorker(worker.id, function (err, _worker) {
-        if (runningChecked) {
+        if (worker.launched) {
           return;
         }
 
         if (_worker.status === 'running') {
-          runningChecked = true;
           clearInterval(statusPoller);
           console.log('[%s] Launched', worker.string);
+          worker.launched = true;
 
-          setTimeout(function () {
+          worker.activityTimeout = setTimeout(function () {
             if (!worker.acknowledged) {
               var subject = "Worker inactive for too long: " + worker.string;
-              var content = "Worker details:\n" + JSON.stringify(worker);
+              var content = "Worker details:\n" + JSON.stringify(worker, null, 4);
 
               utils.alertBrowserStack(subject, content);
             }

lib/server.js

@@ -24,8 +24,9 @@ exports.Server = function Server(bsClient, workers) {
     var url_parts = url.parse(request.url, true);
     var query = url_parts.query;
 
-    if (query._worker_key) {
+    if (query._worker_key && workers[query._worker_key]) {
       workers[query._worker_key].acknowledged = true;
+      console.log("[%s] Acknowledged", query._browser_string);
     }
 
     fs.exists(filename, function(exists) {
@@ -109,8 +110,13 @@ exports.Server = function Server(bsClient, workers) {
 
       if (worker) {
         bsClient.terminateWorker(worker.id, function () {
+          if (!workers[uuid]) {
+            return;
+          }
+
           console.log('[%s] Terminated', worker.string);
 
+          clearTimeout(workers[uuid].activityTimeout);
           delete workers[uuid];
 
           if (utils.objectSize(workers) === 0) {

lib/tunnel.js

@@ -23,6 +23,7 @@ var Tunnel = function Tunnel (key, port, callback, err) {
       if (stdout.indexOf('Error') >= 0) {
         console.log("..Failed");
         console.log(stdout);
+        process.exit(-2);
       }
     });