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

report if state is idle

Browse source
This commit is contained in:
Josh Harvey 2016-04-21 20:01:27 +03:00
parent 1a93d6ae02
commit 4b5b460d12
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/notifier.js
View file

@ -52,7 +52,6 @@ function checkStuckScreen (deviceEvents) {
var sortedEvents = R.sortBy(R.compose(toInt10, R.prop('device_time')), R.map(jsonParse, deviceEvents))
var noRepeatEvents = R.dropRepeatsWith(sameState, sortedEvents)
var lastEvent = R.last(noRepeatEvents)
var IDLE_STATES = ['idle', 'dualIdle']
var STALE_STATE = 60 * 1000
if (!lastEvent) {
@ -60,7 +59,9 @@ function checkStuckScreen (deviceEvents) {
}
var state = lastEvent.note.state
if (R.contains(state, IDLE_STATES)) {
var isIdle = lastEvent.note.isIdle
if (isIdle) {
return []
}

4
lib/plugins.js
View file

@ -361,7 +361,7 @@ exports.stateChange = function stateChange (session, rec, cb) {
id: rec.uuid,
fingerprint: session.fingerprint,
eventType: 'stateChange',
note: JSON.stringify({state: rec.state, sessionId: session.id}),
note: JSON.stringify({state: rec.state, isIdle: rec.isIdle, sessionId: session.id}),
deviceTime: session.deviceTime
}
db.machineEvent(event, cb)
@ -373,7 +373,7 @@ exports.recordPing = function recordPing (session, rec, cb) {
id: uuid.v4(),
fingerprint: session.fingerprint,
eventType: 'ping',
note: JSON.stringify({state: rec.state, sessionId: session.id}),
note: JSON.stringify({state: rec.state, isIdle: rec.idle === 'true', sessionId: session.id}),
deviceTime: session.deviceTime
}
db.machineEvent(event, cb)