From 4b5b460d1209a255aaa044d266effa75c9708377 Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Thu, 21 Apr 2016 20:01:27 +0300 Subject: [PATCH] report if state is idle --- lib/notifier.js | 5 +++-- lib/plugins.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/notifier.js b/lib/notifier.js index 2a0701be..935a73db 100644 --- a/lib/notifier.js +++ b/lib/notifier.js @@ -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 [] } diff --git a/lib/plugins.js b/lib/plugins.js index 7423fd80..1f478026 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -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)