Merge remote-tracking branch 'origin/master' into gitlab_snippets

# Conflicts:
#	bower.json
#	public/views/body.ejs
This commit is contained in:
Jason Croft 2016-05-12 12:32:10 -04:00
commit e65d43bd81
10 changed files with 149 additions and 13 deletions

3
app.js
View file

@ -516,5 +516,8 @@ models.sequelize.sync().then(startListen);
// log uncaught exception
process.on('uncaughtException', function (err) {
logger.error('An uncaught exception has occured.');
logger.error(err);
logger.error('Process will exit now.');
process.exit(1);
});