Ensure errors are logged consistently before exit.

Always exit with status 1 in case of error.
This commit is contained in:
Tobias Lidskog 2014-12-17 23:33:32 +01:00
parent 000d11ebc4
commit 3be848a89f
3 changed files with 7 additions and 7 deletions

View File

@ -1,19 +1,21 @@
#!/usr/bin/env node
var Sitespeed = require('../lib/sitespeed'),
config = require('../lib/cli');
config = require('../lib/cli'),
winston = require('winston');
var sitespeed = new Sitespeed();
require('whereis')('java', function searched(err) {
// yep, we still need Java for the crawler & browsertime
if (err) {
console.error(
'Could not find Java, make sure it is installed in your $PATH');
winston.loggers.get('sitespeed.io').error(
'Could not find Java, make sure it is installed in your $PATH');
process.exit(1);
} else {
sitespeed.run(config, function(err) {
if (err) {
console.error(err);
winston.loggers.get('sitespeed.io').error(err);
process.exit(1);
}
});

View File

@ -47,7 +47,6 @@ AnalyzeOneSite.prototype.run = function(callback) {
}
], function(err, result) {
if (err) {
self.log.log('error', err);
callback(err);
}
else if (self.config.budgetIsFailing) {

View File

@ -58,8 +58,7 @@ Sitespeed.prototype.run = function(config, finishedCb) {
function(err, results) {
if (err) {
// the error is logged where it happens, so just exit
process.exit(1);
return finishedCb(err);
}
// test multiple sites if it is configured
// else test one site