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/app.js
View file

@ -32,12 +32,10 @@ function run () {
return runner() return runner()
} }
const pp = require('./pp')
function runOnce () { function runOnce () {
return verifySchema.valid() return verifySchema.valid()
.then(() => settingsLoader.loadLatest()) .then(() => settingsLoader.loadLatest())
.then(settings => { .then(settings => {
// pp(settings)
poller.start(settings) poller.start(settings)
const httpsServerOptions = { const httpsServerOptions = {

1
lib/routes.js
View file

@ -377,6 +377,7 @@ app.get('/await_dispense/:txId', waitForDispense)
app.post('/dispense', dispense) app.post('/dispense', dispense)
app.use(errorHandler) app.use(errorHandler)
app.use((req, res) => res.status(404).json({err: 'No such route'}))
localApp.get('/pid', (req, res) => { localApp.get('/pid', (req, res) => {
const deviceId = req.query.device_id const deviceId = req.query.device_id

2
lib/settings-loader.js
View file

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