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

WIP

Browse source
This commit is contained in:
Josh Harvey 2017-01-10 18:41:37 +02:00
parent 1183950dad
commit f877f1f977
3 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/settings-loader.js
View file

@ -13,7 +13,6 @@ function loadFixture () {
const fixture = argv.fixture
const machine = argv.machine
console.log('DEBUG22: %j', [fixture, machine])
if (fixture && !machine) throw new Error('Missing --machine parameter for --fixture')
const fixturePath = fixture => path.resolve(__dirname, '..', 'test', 'fixtures', fixture + '.json')
@ -82,7 +81,6 @@ function loadLatestConfig () {
return Promise.all([db.oneOrNone(sql, ['config']), loadFixture()])
.then(([row, fixture]) => {
const config = row ? row.data.config : []
require('./pp')(fixture)
return mergeValues(config, fixture)
})
}