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

fix: send a single state for the machine status

Browse source
This commit is contained in:
Liordino Neto 2020-10-09 16:29:32 -03:00 • committed by Josh Harvey
parent db014a3ed4
commit 79298d5dec
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/machine-loader.js
View file

@ -45,31 +45,25 @@ function getMachineNames (config) {
[machines, notifier.checkPings(machines), dbm.machineEvents(), config] [machines, notifier.checkPings(machines), dbm.machineEvents(), config]
)) ))
.then(([machines, pings, events, config]) => { .then(([machines, pings, events, config]) => {
const getPingStatus = (ping) => { const getStatus = (ping, stuck) => {
if (!ping) return fullyFunctionalStatus if (stuck && stuck.age) return stuckStatus
if (ping.age) return unresponsiveStatus if (ping && ping.age) return unresponsiveStatus
return fullyFunctionalStatus return fullyFunctionalStatus
} }
const getStuckStatus = (stuck) => {
if (!stuck || !stuck.age) return undefined
return stuckStatus
}
const addName = r => { const addName = r => {
const cashOutConfig = configManager.getCashOut(r.deviceId, config) const cashOutConfig = configManager.getCashOut(r.deviceId, config)
const cashOut = !!cashOutConfig.active const cashOut = !!cashOutConfig.active
const ping = getPingStatus(_.first(pings[r.deviceId]))
const stuck = getStuckStatus(_.first(notifier.checkStuckScreen(events, r.name)))
const statuses = [ping] const statuses = [
getStatus(
if (stuck) statuses.push(stuck) _.first(pings[r.deviceId]),
_.first(notifier.checkStuckScreen(events, r.name))
)
]
return _.assign(r, {cashOut, statuses}) return _.assign(r, {cashOut, statuses})
} }