grassrootseconomics/ethstats-server
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #142 from cubedro/develop

Browse Source 
Fixed huge cpu load
This commit is contained in:
Marian OANCΞA 2015-05-19 22:07:52 +03:00
commit a6c801f756
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.html vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/netstats.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/netstats.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
public/js/controllers.js
View File

@ -63,10 +63,10 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
}
}
// var timeout = setInterval(function ()
// {
// $scope.$apply();
// }, 200);
var timeout = setInterval(function ()
{
$scope.$apply();
}, 200);
$scope.getNumber = function (num) {
return new Array(num);

66
public/js/directives.js
View File

@ -7,48 +7,48 @@ angular.module('netStatsApp.directives', [])
elm.text(version);
};
}])
.directive('timeAgo', ['$interval', function($interval) {
function link (scope, element, attrs)
{
var timestamp,
timeoutId;
// .directive('timeAgo', ['$interval', function($interval) {
// function link (scope, element, attrs)
// {
// var timestamp,
// timeoutId;
function updateTime() {
element.text(timeAgo())
}
// function updateTime() {
// element.text(timeAgo())
// }
function timeAgo()
{
if(timestamp === 0)
return '∞';
// function timeAgo()
// {
// if(timestamp === 0)
// return '∞';
var time = (new Date()).getTime();
var diff = Math.floor((time - timestamp)/1000);
// var time = (new Date()).getTime();
// var diff = Math.floor((time - timestamp)/1000);
if(diff < 60)
return Math.round(diff) + ' s ago';
// if(diff < 60)
// return Math.round(diff) + ' s ago';
return moment.duration(Math.round(diff), 's').humanize() + ' ago';
};
// return moment.duration(Math.round(diff), 's').humanize() + ' ago';
// };
scope.$watch(attrs.timeAgo, function(value) {
timestamp = value;
updateTime();
});
// scope.$watch(attrs.timeAgo, function(value) {
// timestamp = value;
// updateTime();
// });
element.on('$destroy', function() {
$interval.cancel(timeoutId);
});
// element.on('$destroy', function() {
// $interval.cancel(timeoutId);
// });
timeoutId = $interval(function () {
updateTime();
}, 200);
};
// timeoutId = $interval(function () {
// updateTime();
// }, 200);
// };
return {
link: link
};
}])
// return {
// link: link
// };
// }])
.directive('sparkchart', function () {
return {

6
views/index.jade
View File

@ -26,8 +26,8 @@ block content
i.icon-time
div.big-details-holder
span.small-title last block
//- span.big-details {{ lastBlock | blockTimeFilter }}
span.big-details(time-ago="lastBlock")
span.big-details {{ lastBlock | blockTimeFilter }}
//- span.big-details(time-ago="lastBlock")
div.clearfix
div.col-xs-2.stat-holder
div.big-info.avgblocktime(class="{{ avgBlockTime | avgTimeClass }}")
@ -205,7 +205,7 @@ block content
span.small {{node.stats.block.totalDifficulty | number}}
td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}}
td(style="padding-left: 14px;") {{node.stats.block.uncles.length || 0}}
td(class="{{ node.stats.block.received | timeClass : node.stats.active }}", time-ago="node.stats.block.received")
td(class="{{ node.stats.block.received | timeClass : node.stats.active }}") {{node.stats.block.received | blockTimeFilter }}
td(class="{{ node.stats | propagationTimeClass : bestBlock }}")
div.propagationBox
span {{node.stats.block.propagation | blockPropagationFilter}}