From 600e2299e93daed830106ac2c482bc682fb8f5ec Mon Sep 17 00:00:00 2001
From: soulgalore <peter@soulgalore.com>
Date: Tue, 16 Sep 2014 20:41:34 +0200
Subject: [PATCH] don't write info about when we fetch the waterfall

---
 lib/analyze/webpagetest.js | 85 +++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/lib/analyze/webpagetest.js b/lib/analyze/webpagetest.js
index 90bfdd04d..a0e969a47 100644
--- a/lib/analyze/webpagetest.js
+++ b/lib/analyze/webpagetest.js
@@ -93,64 +93,63 @@ function analyzeUrl(args, asyncDoneCallback) {
 
     async.parallel({
         fetchWaterfall: function(cb) {
-            var waterfallOptions = {
-                  dataURI:false,
-                  colorByMime:true,
-                  width: 1140
-                };
-                wpt.getWaterfallImage(id, waterfallOptions, function(err,data,info) {
+          var waterfallOptions = {
+            dataURI: false,
+            colorByMime: true,
+            width: 1140
+          };
+          wpt.getWaterfallImage(id, waterfallOptions, function(err, data, info) {
 
-              var wstream = fs.createWriteStream(path.join(config.run.absResultDir, config.dataDir,
+            var wstream = fs.createWriteStream(path.join(config.run.absResultDir, config.dataDir,
               'webpagetest', util.getFileName(url) + '-waterfall.png'));
 
-              wstream.on('finish', function () {
-                  console.log('Wrote waterfall');
-                });
-              wstream.write(data);
-              wstream.end();
-              cb();
-            });
+            // wstream.on('finish', function () {
+            // });
+            wstream.write(data);
+            wstream.end();
+            cb();
+          });
         },
         fetchRepeatWaterfall: function(cb) {
-            var waterfallOptions = {
-                  dataURI: false,
-                  colorByMime: true,
-                  repeatView: true,
-                  width: 1140
-                };
-                wpt.getWaterfallImage(id, waterfallOptions, function(err,data,info) {
+          var waterfallOptions = {
+            dataURI: false,
+            colorByMime: true,
+            repeatView: true,
+            width: 1140
+          };
+          wpt.getWaterfallImage(id, waterfallOptions, function(err, data, info) {
 
-              var wstream = fs.createWriteStream(path.join(config.run.absResultDir, config.dataDir,
+            var wstream = fs.createWriteStream(path.join(config.run.absResultDir, config.dataDir,
               'webpagetest', util.getFileName(url) + '-waterfall-repeat.png'));
 
-              wstream.on('finish', function () {
-                  console.log('Wrote waterfall');
-                });
-              wstream.write(data);
-              wstream.end();
-              cb();
+            wstream.on('finish', function() {
+              console.log('Wrote waterfall');
             });
+            wstream.write(data);
+            wstream.end();
+            cb();
+          });
         },
         fetchHar: function(cb) {
-          wpt.getHARData(id, {}, function(err,data) {
+          wpt.getHARData(id, {}, function(err, data) {
             if (err) {
-                throw err;
-              }
+              throw err;
+            }
             har = data;
             var harPath = path.join(config.run.absResultDir, config.dataDir,
               'webpagetest',
               util.getFileName(url) + '-wpt.har');
             fs.writeFile(harPath, JSON.stringify(data), function(err) {
-            cb();
-          });
+              cb();
+            });
 
-        });
+          });
         },
         storeWptData: function(cb) {
-            var jsonPath = path.join(config.run.absResultDir, config.dataDir,
-              'webpagetest',
-              util.getFileName(url) + '-webpagetest.json');
-            fs.writeFile(jsonPath, JSON.stringify(data), function(err) {
+          var jsonPath = path.join(config.run.absResultDir, config.dataDir,
+            'webpagetest',
+            util.getFileName(url) + '-webpagetest.json');
+          fs.writeFile(jsonPath, JSON.stringify(data), function(err) {
             cb();
           });
         },
@@ -158,10 +157,12 @@ function analyzeUrl(args, asyncDoneCallback) {
       function(err, results) {
         if (err) {
           asyncDoneCallback(undefined, err);
-        }
-        else {
-        asyncDoneCallback({'wpt': data, 'har': har}, undefined);
+        } else {
+          asyncDoneCallback({
+            'wpt': data,
+            'har': har
+          }, undefined);
         }
       });
   });
-}
+}
\ No newline at end of file