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

fix: removed unnecessary processes from the account loading process

Browse source 
fix: treat an empty response as an error when loading the latest config
This commit is contained in:
Liordino Neto 2020-08-09 15:43:46 -03:00 • committed by Josh Harvey
parent 6e356217ae
commit f95deab005
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/new-settings-loader.js
View file

@ -16,9 +16,6 @@ function saveAccounts (accountsToSave) {
} }
function loadAccounts () { function loadAccounts () {
const toFields = fieldArr => _.fromPairs(_.map(r => [r.code, r.value], fieldArr))
const toPairs = r => [r.code, toFields(r.fields)]
const sql = `select data const sql = `select data
from user_config from user_config
where type=$1 where type=$1
@ -28,10 +25,7 @@ function loadAccounts () {
limit 1` limit 1`
return db.oneOrNone(sql, ['accounts', NEW_SETTINGS_LOADER_SCHEMA_VERSION]) return db.oneOrNone(sql, ['accounts', NEW_SETTINGS_LOADER_SCHEMA_VERSION])
.then(row => { .then(row => row ? row.data.accounts : null)
if (!row) return {}
return _.fromPairs(_.map(toPairs, row.data.accounts))
})
} }
function saveConfig (config) { function saveConfig (config) {
@ -61,11 +55,11 @@ function loadLatestConfig () {
order by id desc order by id desc
limit 1` limit 1`
return db.oneOrNone(sql, ['config', NEW_SETTINGS_LOADER_SCHEMA_VERSION]) return db.one(sql, ['config', NEW_SETTINGS_LOADER_SCHEMA_VERSION])
.then(row => !row ? {} : row.data.config) .then(row => !row ? {} : row.data.config)
.catch(err => { .catch(err => {
if (err.name === 'QueryResultError') { if (err.name === 'QueryResultError') {
throw new Error('lamassu-server is not configured') throw new Error('No config was found')
} }
throw err throw err