From 8cecaff1ae7240902249676b7d24fadca03fc5a9 Mon Sep 17 00:00:00 2001
From: James Barnett <noreply@jamesbarnett.xyz>
Date: Sun, 7 Oct 2018 16:09:42 +0100
Subject: Basic logging functionality. Logs every 60s.

Needs log rotation/management to avoid huge logfiles.
---
 routes/ws.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'routes/ws.js')

diff --git a/routes/ws.js b/routes/ws.js
index 08b0a18..86eec0d 100644
--- a/routes/ws.js
+++ b/routes/ws.js
@@ -4,6 +4,7 @@ const router = express.Router();
 const deviceManager = require('../services/device-manager');
 const dataFetcher = require('../services/data-fetcher');
 const dataBroadcaster = require('../services/data-broadcaster');
+const dataLogger = require('../services/data-logger.js');
 
 router.ws('/', function(ws, req) {
 
@@ -15,11 +16,15 @@ router.ws('/', function(ws, req) {
     if(message.requestType === 'getCachedData') {
       let deviceId = message.deviceId;
       let cachedData = dataFetcher.getCachedData(deviceId);
-
+      
       ws.send(dataBroadcaster.generatePayload('realtimeUsage', deviceId, cachedData.realtimeUsage));
       ws.send(dataBroadcaster.generatePayload('dailyUsage', deviceId, cachedData.dailyUsage));
       ws.send(dataBroadcaster.generatePayload('monthlyUsage', deviceId, cachedData.monthlyUsage));
       ws.send(dataBroadcaster.generatePayload('powerState', deviceId, cachedData.powerState));
+      dataLogger.getAllEntries(deviceId, (loggedData) => {
+        ws.send(dataBroadcaster.generatePayload('loggedData', deviceId, loggedData));
+      });
+      
     }
   });
 
-- 
cgit v1.2.3