added test path for logging. #65

Author: dhimil

bin/cli.js

@@ -71,9 +71,10 @@ function launchServer() {
   server.listen(parseInt(serverPort, 10));
 }
 
-function launchBrowser(browser, url) {
+function launchBrowser(browser, path) {
+  var url = 'http://localhost:' + serverPort.toString() + '/' + path;
   var browserString = utils.browserString(browser);
-  logger.debug("[%s] Launching", browserString);
+  logger.debug("[%s] [%s] Launching", browserString, path);
 
   var key = utils.uuid();
 
@@ -118,22 +119,24 @@ function launchBrowser(browser, url) {
 
     worker.config = browser;
     worker.string = browserString;
+    worker.test_path = path;
     workers[key] = worker;
     workerKeys[worker.id] = {key: key, marked: false};
   });
 
 }
 
 function launchBrowsers(config, browser) {
+  var multiple_tests = Object.prototype.toString.call(config.test_path) === '[object Array]';
+  var total_workers = config.browsers.length * (multiple_tests ? config.test_path.length : 1);
+  logger.info("Launching " + total_workers + " workers");
   setTimeout(function () {
-    if(Object.prototype.toString.call(config.test_path) === '[object Array]'){
+    if(multiple_tests){
       config.test_path.forEach(function(path){
-        var url = 'http://localhost:' + serverPort.toString() + '/' + path;
-        launchBrowser(browser,url);
+        launchBrowser(browser, path);
       });
     } else {
-      var url = 'http://localhost:' + serverPort.toString() + '/' + config.test_path;
-      launchBrowser(browser,url);
+      launchBrowser(browser, config.test_path);
     }
   }, 100);
 }
@@ -157,7 +160,7 @@ var statusPoller = {
 
           if (_worker.status === 'running') {
             //clearInterval(statusPoller);
-            logger.debug('[%s] Launched', worker.string);
+            logger.debug('[%s] [%s] Launched', worker.string, worker.test_path);
             worker.launched = true;
             workerData.marked = true;
 
@@ -219,7 +222,6 @@ function runTests() {
       launchServer();
       tunnel = new Tunnel(config.key, serverPort, config.tunnelIdentifier, function () {
         statusPoller.start();
-        logger.info("Launching " + browsers.length + " workers");
         browsers.forEach(function(browser) {
           if (browser.browser_version === "latest") {
             logger.debug("[%s] Finding version.", utils.browserString(browser));

lib/server.js

@@ -28,8 +28,9 @@ exports.Server = function Server(bsClient, workers) {
     var query = url_parts.query;
 
     if (query._worker_key && workers[query._worker_key]) {
-      workers[query._worker_key].acknowledged = true;
-      logger.debug("[%s] Acknowledged", query._browser_string);
+      worker = workers[query._worker_key] || {};
+      worker.acknowledged = true;
+      logger.debug("[%s] [%s] Acknowledged", query._browser_string, worker.test_path);
     }
 
     fs.exists(filename, function(exists) {
@@ -136,7 +137,7 @@ exports.Server = function Server(bsClient, workers) {
   handlers = {
     "_progress": function progressHandler(uri, body, request, response) {
       var uuid = request.headers['x-worker-uuid'];
-      var worker = workers[uuid];
+      var worker = workers[uuid] || {};
       query = "";
       try {
         query = parseBody(body);
@@ -147,7 +148,7 @@ exports.Server = function Server(bsClient, workers) {
 
       if (query.tracebacks) {
         query.tracebacks.forEach(function(traceback) {
-          logger.info(chalk.red("[%s] Error:"), worker.string, formatTraceback(traceback));
+          logger.info(chalk.red("[%s] [%s] Error:"), worker.string, worker.test_path, formatTraceback(traceback));
         });
       }
       response.end();
@@ -159,34 +160,34 @@ exports.Server = function Server(bsClient, workers) {
         query = parseBody(body);
       } catch (e) {}
       var uuid = request.headers['x-worker-uuid'];
-      var worker = workers[uuid];
+      var worker = workers[uuid] || {};
 
       if (query === null) {
         logger.info("[%s] Null response from remote Browser", request.headers['x-browser-string']);
       } else {
         if (query.tracebacks && query.tracebacks.length > 0) {
-          logger.info("Tracebacks:");
+          logger.info(chalk["red"]("[%s] [%s] Tracebacks:"), request.headers['x-browser-string'], worker.test_path);
           query.tracebacks.forEach(function(traceback) {
             logger.info(traceback);
           });
         }
         var color = query.failed ? "red" : "green";
-        logger.info(chalk[color]("[%s] Completed in %d milliseconds. %d of %d passed, %d failed."), request.headers['x-browser-string'], query.runtime, query.passed, query.total, query.failed);
+        logger.info(chalk[color]("[%s] [%s] Completed in %d milliseconds. %d of %d passed, %d failed."), request.headers['x-browser-string'], worker.test_path, query.runtime, query.passed, query.total, query.failed);
         config.status += query.failed;
       }
 
       if (worker) {
         bsClient.takeScreenshot(worker.id, function(error, screenshot) {
           if (!error && screenshot.url) {
-            logger.info('[%s] ' + chalk['yellow']('Screenshot') + ': %s', worker.string, screenshot.url);
+            logger.info('[%s] [%s] ' + chalk['yellow']('Screenshot') + ': %s', worker.string, worker.test_path, screenshot.url);
           }
 
           bsClient.terminateWorker(worker.id, function() {
             if (!workers[uuid]) {
               return;
             }
 
-            logger.debug('[%s] Terminated', worker.string);
+            logger.debug('[%s] [%s] Terminated', worker.string, worker.test_path);
 
             clearTimeout(workers[uuid].activityTimeout);
             delete workers[uuid];