Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Liran Tal
2014-11-27 09:53:44 +02:00
3 changed files with 9 additions and 6 deletions

View File

@@ -144,9 +144,6 @@ module.exports = function(db) {
});
if (process.env.NODE_ENV === 'secure') {
// Log SSL usage
console.log('Securely using https protocol');
// Load SSL key and certificate
var privateKey = fs.readFileSync('./config/sslcerts/key.pem', 'utf8');
var certificate = fs.readFileSync('./config/sslcerts/cert.pem', 'utf8');

View File

@@ -25,8 +25,6 @@ module.exports = function() {
}
process.env.NODE_ENV = 'development';
} else {
console.log(chalk.black.bgWhite('Application loaded using the "' + process.env.NODE_ENV + '" environment configuration'));
}
});

View File

@@ -33,4 +33,12 @@ app.listen(config.port);
exports = module.exports = app;
// Logging initialization
console.log('MEAN.JS application started on port ' + config.port);
console.log('--');
console.log(chalk.green(config.app.title + ' application started'));
console.log(chalk.green('Environment:\t\t\t' + process.env.NODE_ENV));
console.log(chalk.green('Port:\t\t\t\t' + config.port));
console.log(chalk.green('Database:\t\t\t' + config.db));
if (process.env.NODE_ENV === 'secure') {
console.log(chalk.green('HTTPs:\t\t\t\ton'));
}
console.log('--');