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

fix: use more specific function

Browse source 
`loadLatest()` returns a `Promise`, therefore accessing the `config`
property is not correct.
This commit is contained in:
siiky 2024-09-17 14:58:58 +01:00
parent 437a1d3505
commit 5342e9a8be
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/machine-loader.js
View file

@ -11,7 +11,6 @@ const pairing = require('./pairing')
const { checkPings, checkStuckScreen } = require('./notifier') const { checkPings, checkStuckScreen } = require('./notifier')
const dbm = require('./postgresql_interface') const dbm = require('./postgresql_interface')
const configManager = require('./new-config-manager') const configManager = require('./new-config-manager')
const settingsLoader = require('./new-settings-loader')
const notifierUtils = require('./notifier/utils') const notifierUtils = require('./notifier/utils')
const notifierQueries = require('./notifier/queries') const notifierQueries = require('./notifier/queries')
const { ApolloError } = require('apollo-server-errors'); const { ApolloError } = require('apollo-server-errors');
@ -94,9 +93,7 @@ function getUnpairedMachines () {
} }
function getConfig (defaultConfig) { function getConfig (defaultConfig) {
if (defaultConfig) return Promise.resolve(defaultConfig) return defaultConfig ? Promise.resolve(defaultConfig) : loadLatestConfig()
return settingsLoader.loadLatest().config
} }
const getStatus = (ping, stuck) => { const getStatus = (ping, stuck) => {
@ -529,7 +526,6 @@ module.exports = {
updateNetworkHeartbeat, updateNetworkHeartbeat,
getNetworkPerformance, getNetworkPerformance,
getNetworkHeartbeat, getNetworkHeartbeat,
getConfig,
getMachineIds, getMachineIds,
emptyMachineUnits, emptyMachineUnits,
refillMachineUnits, refillMachineUnits,