@@ -12,4 +12,4 @@ firebaseConfig.js | |||||
helpers/sqlite-to-rethink/rethinkdb_data | helpers/sqlite-to-rethink/rethinkdb_data | ||||
helpers/sqlite-to-rethink/tmp | helpers/sqlite-to-rethink/tmp | ||||
helpers/sqlite-to-rethink/log_file | helpers/sqlite-to-rethink/log_file | ||||
helpers/sqlite-to-rethink/rethink.exe | |||||
helpers/sqlite-to-rethink/rethinkdb.exe |
@@ -7,7 +7,7 @@ const config = { | |||||
dbName: 'dev', | dbName: 'dev', | ||||
dropTables: false, | |||||
dropTables: true, | |||||
maxBusy: 100, | maxBusy: 100, | ||||
@@ -7,7 +7,10 @@ module.exports = { | |||||
//Options: | //Options: | ||||
// sqlite | // sqlite | ||||
// rethink | // rethink | ||||
db: 'rethink', | |||||
dbHost: 'localhost', | |||||
dbPort: 28015 | |||||
//eslint-disable-next-line no-process-env | |||||
db: process.env.IWD_DB || 'rethink', | |||||
//eslint-disable-next-line no-process-env | |||||
dbHost: process.env.IWD_DB_HOST || 'localhost', | |||||
//eslint-disable-next-line no-process-env | |||||
dbPort: process.env.IWD_DB_PORT || 28015 | |||||
}; | }; |
@@ -1,12 +1,9 @@ | |||||
let serverConfig = require('../config/serverConfig'); | let serverConfig = require('../config/serverConfig'); | ||||
//eslint-disable-next-line no-process-env | |||||
const useDb = process.env.db || serverConfig.db; | |||||
const moduleMap = { | const moduleMap = { | ||||
sqlite: 'Sqlite', | sqlite: 'Sqlite', | ||||
rethink: 'RethinkDb' | rethink: 'RethinkDb' | ||||
}; | }; | ||||
const modulePath = `./mail${moduleMap[useDb]}`; | |||||
const modulePath = `./mail${moduleMap[serverConfig.db]}`; | |||||
module.exports = require(modulePath); | module.exports = require(modulePath); |
@@ -1,8 +1,7 @@ | |||||
let util = require('util'); | let util = require('util'); | ||||
let serverConfig = require('../config/serverConfig'); | let serverConfig = require('../config/serverConfig'); | ||||
//eslint-disable-next-line no-process-env | |||||
if ((process.env.db || serverConfig.db) === 'rethink') { | |||||
if (serverConfig.db === 'rethink') { | |||||
module.exports = require('./ioRethink'); | module.exports = require('./ioRethink'); | ||||
return; | return; | ||||
} | } | ||||
@@ -22,10 +22,8 @@ module.exports = { | |||||
init: async function (cbReady) { | init: async function (cbReady) { | ||||
const dbConfig = { | const dbConfig = { | ||||
//eslint-disable-next-line no-process-env | |||||
host: process.env.dbHost || serverConfig.dbHost || 'localhost', | |||||
//eslint-disable-next-line no-process-env | |||||
port: process.env.dbPort || serverConfig.dbPort || 28015 | |||||
host: serverConfig.dbHost, | |||||
port: serverConfig.dbPort | |||||
}; | }; | ||||
this.connection = await r.connect(dbConfig); | this.connection = await r.connect(dbConfig); | ||||