lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clean up code

Browse source
This commit is contained in:
Sérgio Salgado 2021-10-26 20:31:32 +01:00
parent 2c68323f66
commit 59de9e268e
2 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

0
.env.dev → .env.sample
View file

21
lib/options-loader.js
View file

@ -4,8 +4,9 @@ const os = require('os')
const argv = require('minimist')(process.argv.slice(2)) const argv = require('minimist')(process.argv.slice(2))
const _ = require('lodash/fp') const _ = require('lodash/fp')
require('dotenv').config({ path: `.env${process.env.NODE_ENV !== 'production' ? `.dev` : ``}` }) require('dotenv').config()
const dbPath = !process.env.LAMASSU_DB ? 'PROD' : process.env.LAMASSU_DB
const dbMapping = psqlConf => ({ const dbMapping = psqlConf => ({
STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf), STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf),
RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf), RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf),
@ -40,11 +41,7 @@ function load () {
opts: JSON.parse(fs.readFileSync(globalConfigPath)) opts: JSON.parse(fs.readFileSync(globalConfigPath))
} }
config.opts.postgresql = dbMapping(config.opts.postgresql)[ config.opts.postgresql = dbMapping(config.opts.postgresql)[dbPath]
process.env.LAMASSU_DB === '' || !process.env.LAMASSU_DB
? 'PROD'
: process.env.LAMASSU_DB
]
return config return config
} catch (_) { } catch (_) {
@ -55,17 +52,7 @@ function load () {
opts: JSON.parse(fs.readFileSync(homeConfigPath)) opts: JSON.parse(fs.readFileSync(homeConfigPath))
} }
console.log('flag', dbMapping(config.opts.postgresql)[ config.opts.postgresql = dbMapping(config.opts.postgresql)[dbPath]
process.env.LAMASSU_DB === '' || !process.env.LAMASSU_DB
? 'PROD'
: process.env.LAMASSU_DB
])
config.opts.postgresql = dbMapping(config.opts.postgresql)[
process.env.LAMASSU_DB === '' || !process.env.LAMASSU_DB
? 'PROD'
: process.env.LAMASSU_DB
]
return config return config
} catch (_) { } catch (_) {