Merge pull request #64 from EdgeApp/sam/debugging-changes

Sam/debugging changes

src/daemons/priceChangeDaemon.ts

@@ -28,7 +28,7 @@ runDaemon(async tools => {
       logger.warn({ msg: 'Failed event', id, err })
     }
 
-    heartbeat()
+    heartbeat(`row '${eventRow.id}'`)
   }
 })
 

src/daemons/runDaemon.ts

@@ -91,9 +91,10 @@ async function iterate(
 
   const heartbeat = makeHeartbeat({
     write: chunk => {
-      const [timeElapsed, item] = chunk.split(',')
+      const [timeElapsed, ...rest] = chunk.split(',')
+      const info = rest.join(',').trim()
       logger.info(
-        { timeElapsed: timeElapsed.trim(), item: item.trim() },
+        { timeElapsed: timeElapsed.trim(), info },
         'heartbeat %s',
         chunk
       )

src/db/couchPushEvents.ts

@@ -36,6 +36,7 @@ import { PushEvent, PushTrigger } from '../types/pushTypes'
  * To make changes, edit the `event` object, then call `save`.
  */
 export interface PushEventRow {
+  id: string
   event: PushEvent
   save: () => Promise<void>
 }
@@ -267,6 +268,7 @@ function makePushEventRow(
   let base = { ...event }
 
   return {
+    id: clean.id,
     event,
 
     async save(): Promise<void> {

src/util/heartbeat.ts

@@ -34,7 +34,7 @@ export function makeHeartbeat(
     if (seconds < nextSeconds) return
     nextSeconds += logSeconds
 
-    let out = `${seconds.toFixed(2)}s, ${count} rows`
+    let out = `${seconds.toFixed(2)}s, ${count} beats`
     if (item != null) out += `, ${item}`
     out += '\n'
     stderr.write(out)