public/homebrewery
1
0
Fork 0
mirror of https://github.com/stolksdorf/homebrewery.git synced 2025-12-15 12:25:57 +00:00
Code Issues Releases Wiki Activity

Updating DB to handle newer versions of mongo

Browse Source
This commit is contained in:
Scott Tolksdorf
2017-05-28 11:24:50 -04:00
parent 2023ae4f6a
commit b39f9041c2
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server.js
View File

@@ -7,9 +7,6 @@ const config = require('nconf')
const log = require('loglevel'); const log = require('loglevel');
log.setLevel(config.get('log_level')); log.setLevel(config.get('log_level'));
//DB
require('./server/db.js').connect();
//Server //Server
const app = require('./server/app.js'); const app = require('./server/app.js');
@@ -29,7 +26,11 @@ app.use((req, res, next) => {
}); });
*/ */
const PORT = process.env.PORT || 8000; require('./server/db.js').connect()
const httpServer = app.listen(PORT, () => { .then(()=>{
log.info(`server on port:${PORT}`); const PORT = process.env.PORT || 8000;
}); const httpServer = app.listen(PORT, () => {
log.info(`server on port:${PORT}`);
});
})
.catch((err)=>console.error(err))

2
server/db.js
View File

@@ -7,7 +7,7 @@ const dbPath = process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb:/
module.exports = { module.exports = {
connect : ()=>{ connect : ()=>{
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
if(mongoose.connection.readyState == 1){ if(mongoose.connection.readyState !== 0){
log.warn('DB already connected'); log.warn('DB already connected');
return resolve(); return resolve();
} }