added peer propagation chart
This commit is contained in:
parent
68e7f66f3d
commit
3493a5b2b1
@ -1,5 +1,7 @@
|
|||||||
var geoip = require('geoip-lite');
|
var geoip = require('geoip-lite');
|
||||||
|
|
||||||
|
var MAX_HISTORY = 36;
|
||||||
|
|
||||||
var Node = function Node(data)
|
var Node = function Node(data)
|
||||||
{
|
{
|
||||||
this.id = null;
|
this.id = null;
|
||||||
@ -29,6 +31,7 @@ var Node = function Node(data)
|
|||||||
uptime: 0,
|
uptime: 0,
|
||||||
lastUpdate: 0
|
lastUpdate: 0
|
||||||
};
|
};
|
||||||
|
this.blockHistory = [];
|
||||||
this.uptime = {
|
this.uptime = {
|
||||||
started: null,
|
started: null,
|
||||||
history: []
|
history: []
|
||||||
@ -83,7 +86,7 @@ Node.prototype.setInfo = function(data)
|
|||||||
|
|
||||||
Node.prototype.getInfo = function()
|
Node.prototype.getInfo = function()
|
||||||
{
|
{
|
||||||
return {id: this.id, info: this.info, geo: this.geo, stats: this.stats};
|
return {id: this.id, info: this.info, geo: this.geo, stats: this.stats, history: this.blockHistory};
|
||||||
}
|
}
|
||||||
|
|
||||||
Node.prototype.setStats = function(stats)
|
Node.prototype.setStats = function(stats)
|
||||||
@ -92,6 +95,20 @@ Node.prototype.setStats = function(stats)
|
|||||||
{
|
{
|
||||||
stats.block.hash = stats.block.hash.replace('0x', '');
|
stats.block.hash = stats.block.hash.replace('0x', '');
|
||||||
|
|
||||||
|
if(stats.block.number > this.stats.block.number)
|
||||||
|
{
|
||||||
|
if(this.blockHistory.length === MAX_HISTORY )
|
||||||
|
this.blockHistory.shift();
|
||||||
|
|
||||||
|
var history = {
|
||||||
|
number: stats.block.number,
|
||||||
|
received: stats.block.received,
|
||||||
|
propagation: stats.block.propagation
|
||||||
|
};
|
||||||
|
|
||||||
|
this.blockHistory.push(history);
|
||||||
|
}
|
||||||
|
|
||||||
this.stats = stats;
|
this.stats = stats;
|
||||||
|
|
||||||
return this.getStats();
|
return this.getStats();
|
||||||
@ -114,7 +131,7 @@ Node.prototype.setLatency = function(latency)
|
|||||||
|
|
||||||
Node.prototype.getStats = function()
|
Node.prototype.getStats = function()
|
||||||
{
|
{
|
||||||
return {id: this.id, stats: this.stats};
|
return {id: this.id, stats: this.stats, history: this.blockHistory};
|
||||||
}
|
}
|
||||||
|
|
||||||
Node.prototype.setState = function(active)
|
Node.prototype.setState = function(active)
|
||||||
|
@ -229,6 +229,10 @@ table td {
|
|||||||
width: 110px;
|
width: 110px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.th-peerPropagationChart {
|
||||||
|
width: 140px;
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 639px) {
|
@media only screen and (max-width: 639px) {
|
||||||
/*.big-info {
|
/*.big-info {
|
||||||
padding-bottom: 15px;
|
padding-bottom: 15px;
|
||||||
|
@ -103,7 +103,18 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case "update":
|
case "update":
|
||||||
$scope.nodes[findIndex({id: data.id})].stats = data.stats;
|
var index = findIndex({id: data.id});
|
||||||
|
$scope.nodes[index].stats = data.stats;
|
||||||
|
$scope.nodes[index].history = data.history;
|
||||||
|
$scope.nodes[index].propagation = _.map(data.history, function(block) {
|
||||||
|
return block.propagation;
|
||||||
|
});
|
||||||
|
jQuery('.' + data.id).sparkline($scope.nodes[index].propagation, {
|
||||||
|
type: 'bar',
|
||||||
|
height: 20,
|
||||||
|
barWidth : 2,
|
||||||
|
barSpacing : 1,
|
||||||
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "info":
|
case "info":
|
||||||
@ -143,6 +154,10 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$scope.nodes[index] = data;
|
$scope.nodes[index] = data;
|
||||||
|
$scope.nodes[index].history = data.history;
|
||||||
|
$scope.nodes[index].propagation = _.map(data.history, function(block) {
|
||||||
|
return block.propagation;
|
||||||
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -211,8 +226,6 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
|
|||||||
longitude: 0
|
longitude: 0
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
// console.log($scope.map);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
|
@ -71,7 +71,6 @@ angular.module('netStatsApp.filters', [])
|
|||||||
})
|
})
|
||||||
.filter('timeClass', function() {
|
.filter('timeClass', function() {
|
||||||
return function(timestamp) {
|
return function(timestamp) {
|
||||||
console.log(timestamp);
|
|
||||||
return timeClass(timestamp);
|
return timeClass(timestamp);
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
@ -129,6 +129,7 @@ block content
|
|||||||
i.icon-time(data-toggle="tooltip", data-placement="top", title="Last block time", ng-click="orderTable('-stats.block.received', false)")
|
i.icon-time(data-toggle="tooltip", data-placement="top", title="Last block time", ng-click="orderTable('-stats.block.received', false)")
|
||||||
th
|
th
|
||||||
i.icon-gas(data-toggle="tooltip", data-placement="top", title="Propagation time", ng-click="orderTable('stats.block.propagation', false)")
|
i.icon-gas(data-toggle="tooltip", data-placement="top", title="Propagation time", ng-click="orderTable('stats.block.propagation', false)")
|
||||||
|
th.th-peerPropagationChart
|
||||||
th
|
th
|
||||||
i.icon-bulb(data-toggle="tooltip", data-placement="top", title="Up-time", ng-click="orderTable('-stats.uptime', false)")
|
i.icon-bulb(data-toggle="tooltip", data-placement="top", title="Up-time", ng-click="orderTable('-stats.uptime', false)")
|
||||||
tbody
|
tbody
|
||||||
@ -150,4 +151,5 @@ block content
|
|||||||
td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}}
|
td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}}
|
||||||
td(class="{{ node.stats.block.received | timeClass }}") {{node.stats.block.received | blockTimeFilter }}
|
td(class="{{ node.stats.block.received | timeClass }}") {{node.stats.block.received | blockTimeFilter }}
|
||||||
td(class="{{ node.stats.block | propagationTimeClass : bestBlock }}") {{node.stats.block.propagation | blockPropagationFilter}}
|
td(class="{{ node.stats.block | propagationTimeClass : bestBlock }}") {{node.stats.block.propagation | blockPropagationFilter}}
|
||||||
|
td.peerPropagationChart(class="{{node.id}}")
|
||||||
td(class="{{ node.stats.uptime | upTimeClass }}") {{ node.stats.uptime | upTimeFilter }}
|
td(class="{{ node.stats.uptime | upTimeClass }}") {{ node.stats.uptime | upTimeFilter }}
|
||||||
|
Loading…
Reference in New Issue
Block a user