t1meshift
/
expressCart
mirror of https://github.com/t1meshift/expressCart.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Change startup and only run indexing while not in test env

master
Mark Moffat 2019-06-11 19:33:42 +09:30
parent d18940a9dd
commit 9208619803
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app.js
View File

@ -12,7 +12,7 @@ const helmet = require('helmet');
const colors = require('colors'); const colors = require('colors');
const cron = require('node-cron'); const cron = require('node-cron');
const common = require('./lib/common'); const common = require('./lib/common');
const { initDb } = require('./lib/db'); const{initDb} = require('./lib/db');
let handlebars = require('express-handlebars'); let handlebars = require('express-handlebars');
// Validate our settings schema // Validate our settings schema
@ -323,7 +323,7 @@ app.on('uncaughtException', (err) => {
process.exit(2); process.exit(2);
}); });
initDb(config.databaseConnectionString, (err, db) => { initDb(config.databaseConnectionString, async (err, db) => {
// On connection error we display then exit // On connection error we display then exit
if(err){ if(err){
console.log(colors.red('Error connecting to MongoDB: ' + err)); console.log(colors.red('Error connecting to MongoDB: ' + err));
@ -354,19 +354,24 @@ initDb(config.databaseConnectionString, (err, db) => {
config.trackStock = true; config.trackStock = true;
} }
// run indexing // We index when not in test env
common.runIndexing(app) if(process.env.NODE_ENV !== 'test'){
.then(app.listen(app.get('port'))) try{
.then(() => { await common.runIndexing(app);
// lift the app }catch(ex){
console.error(colors.red('Error setting up indexes:' + err));
}
}
// Start the app
try{
await app.listen(app.get('port'));
app.emit('appStarted'); app.emit('appStarted');
console.log(colors.green('expressCart running on host: http://localhost:' + app.get('port'))); console.log(colors.green('expressCart running on host: http://localhost:' + app.get('port')));
return; }catch(ex){
}) console.error(colors.red('Error starting expressCart app:' + err));
.catch((err) => {
console.error(colors.red('Error setting up indexes:' + err));
process.exit(2); process.exit(2);
}); }
}); });
module.exports = app; module.exports = app;