don't write info about when we fetch the waterfall

This commit is contained in:
soulgalore 2014-09-16 20:41:34 +02:00
parent 393e4eefb0
commit 600e2299e9
1 changed files with 43 additions and 42 deletions

View File

@ -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);
}
});
});
}
}