Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Julian Lam
2017-10-03 13:37:43 -04:00
6 changed files with 93 additions and 35 deletions

View File

@@ -180,8 +180,15 @@ function setupExpressApp(app, callback) {
setupAutoLocale(app, callback);
}
function ping(req, res) {
res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
function ping(req, res, next) {
async.waterfall([
function (next) {
db.getObject('config', next);
},
function () {
res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
},
], next);
}
function setupFavicon(app) {