diff --git a/app.js b/app.js index 1f528b4..2bfb45b 100644 --- a/app.js +++ b/app.js @@ -65,7 +65,10 @@ api.on('connection', function(spark) { if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id)) { - spark.emit('history', Nodes.getHistory().getHistoryRequestInterval()); + var range = Nodes.getHistory().getHistoryRequestInterval(); + console.log("asked " + data.id + " for history"); + console.log('interval', range); + spark.emit('history', range); askedForHistory = true; } @@ -89,13 +92,17 @@ api.on('connection', function(spark) { if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id)) { - spark.emit('history', Nodes.getHistory().getHistoryRequestInterval()); + var range = Nodes.getHistory().getHistoryRequestInterval(); + console.log("asked " + data.id + " for history"); + console.log('interval', range); + spark.emit('history', range); askedForHistory = true; } } }); 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; }); 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] !== '.')