From 61b5ddd1256f29fc26271e4c61aebfcf245a4c5d Mon Sep 17 00:00:00 2001 From: cubedro Date: Tue, 28 Apr 2015 15:47:47 +0300 Subject: [PATCH 1/3] added history request/response log --- app.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app.js b/app.js index 1f528b4..31e63e9 100644 --- a/app.js +++ b/app.js @@ -65,6 +65,7 @@ api.on('connection', function(spark) { if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id)) { + console.log("asked " + data.id + " for history"); spark.emit('history', Nodes.getHistory().getHistoryRequestInterval()); askedForHistory = true; } @@ -89,6 +90,7 @@ api.on('connection', function(spark) { if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id)) { + console.log("asked " + data.id + " for history"); spark.emit('history', Nodes.getHistory().getHistoryRequestInterval()); askedForHistory = true; } @@ -96,6 +98,7 @@ api.on('connection', function(spark) { }); spark.on('history', function(data){ + console.log("got history from " + data.id); client.write({action: 'charts', data: Nodes.addHistory(data.id, data.history)}); askedForHistory = false; }); From 98253b9f3f41e6e7211a61968f82d486b1880886 Mon Sep 17 00:00:00 2001 From: cubedro Date: Tue, 28 Apr 2015 15:50:36 +0300 Subject: [PATCH 2/3] fixed undefined node version --- public/js/filters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/filters.js b/public/js/filters.js index 04075c5..24a318b 100644 --- a/public/js/filters.js +++ b/public/js/filters.js @@ -275,7 +275,7 @@ angular.module('netStatsApp.filters', []) var tooltip = []; var string = ''; - if(node.info.node !== '') { + if(node.info.node !== '' && typeof node.info.node !== 'undefined') { var eth_version = node.info.node.split('/'); if(eth_version[1][0] !== 'v' && eth_version[1][2] !== '.') From ec83b07f14abe6553aa18d4b0e186ffd938a8566 Mon Sep 17 00:00:00 2001 From: cubedro Date: Tue, 28 Apr 2015 15:55:33 +0300 Subject: [PATCH 3/3] added range to history log --- app.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 31e63e9..2bfb45b 100644 --- a/app.js +++ b/app.js @@ -65,8 +65,10 @@ api.on('connection', function(spark) { if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id)) { + var range = Nodes.getHistory().getHistoryRequestInterval(); console.log("asked " + data.id + " for history"); - spark.emit('history', Nodes.getHistory().getHistoryRequestInterval()); + console.log('interval', range); + spark.emit('history', range); askedForHistory = true; } @@ -90,8 +92,10 @@ api.on('connection', function(spark) { if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id)) { + var range = Nodes.getHistory().getHistoryRequestInterval(); console.log("asked " + data.id + " for history"); - spark.emit('history', Nodes.getHistory().getHistoryRequestInterval()); + console.log('interval', range); + spark.emit('history', range); askedForHistory = true; } }