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