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

refactor: move recordPing() to poll()

Browse source
This commit is contained in:
André Sá 2022-04-05 17:44:04 +01:00
parent af0029581e
commit 40791cb4cd
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/plugins.js
View file

@ -226,7 +226,7 @@ function plugins (settings, deviceId) {
} }
} }
function pollQueries (deviceTime, deviceRec, machineVersion, machineModel) { function pollQueries () {
const localeConfig = configManager.getLocale(deviceId, settings.config) const localeConfig = configManager.getLocale(deviceId, settings.config)
const fiatCode = localeConfig.fiatCurrency const fiatCode = localeConfig.fiatCurrency
const cryptoCodes = localeConfig.cryptoCurrencies const cryptoCodes = localeConfig.cryptoCurrencies
@ -238,7 +238,6 @@ function plugins (settings, deviceId) {
return Promise.all([ return Promise.all([
buildAvailableCassettes(), buildAvailableCassettes(),
recordPing(deviceTime, machineVersion, machineModel),
fetchCurrentConfigVersion(), fetchCurrentConfigVersion(),
millisecondsToMinutes(getTimezoneOffset(localeConfig.timezone)), millisecondsToMinutes(getTimezoneOffset(localeConfig.timezone)),
loyalty.getNumberOfAvailablePromoCodes(), loyalty.getNumberOfAvailablePromoCodes(),
@ -249,7 +248,6 @@ function plugins (settings, deviceId) {
]) ])
.then(([ .then(([
cassettes, cassettes,
_pingRes,
configVersion, configVersion,
timezone, timezone,
numberOfAvailablePromoCodes, numberOfAvailablePromoCodes,
@ -851,6 +849,7 @@ function plugins (settings, deviceId) {
return { return {
getRates, getRates,
recordPing,
buildRates, buildRates,
getRawRates, getRawRates,
buildRatesNoCommission, buildRatesNoCommission,

5
lib/routes/pollingRoutes.js
View file

@ -82,11 +82,12 @@ function poll (req, res, next) {
state.pids = _.update(operatorId, _.set(deviceId, { pid, ts: Date.now() }), state.pids) state.pids = _.update(operatorId, _.set(deviceId, { pid, ts: Date.now() }), state.pids)
return Promise.all([ return Promise.all([
pi.pollQueries(deviceTime, req.query, machineVersion, machineModel), pi.recordPing(deviceTime, machineVersion, machineModel),
pi.pollQueries(),
buildTriggers(configManager.getTriggers(settings.config)), buildTriggers(configManager.getTriggers(settings.config)),
configManager.getTriggersAutomation(settings.config) configManager.getTriggersAutomation(settings.config)
]) ])
.then(([results, triggers, triggersAutomation]) => { .then(([_pingRes, results, triggers, triggersAutomation]) => {
const reboot = pid && state.reboots?.[operatorId]?.[deviceId] === pid const reboot = pid && state.reboots?.[operatorId]?.[deviceId] === pid
const shutdown = pid && state.shutdowns?.[operatorId]?.[deviceId] === pid const shutdown = pid && state.shutdowns?.[operatorId]?.[deviceId] === pid
const restartServices = pid && state.restartServicesMap?.[operatorId]?.[deviceId] === pid const restartServices = pid && state.restartServicesMap?.[operatorId]?.[deviceId] === pid