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

Merge pull request #184 from cubedro/develop

Browse Source 
Fixed bugs
This commit is contained in:
Marian OANCΞA 2015-06-09 04:03:46 +03:00
commit 840cb7e478
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app.js
View File

@ -316,7 +316,8 @@ api.on('connection', function (spark)
{
if( !_.isUndefined(data.id) )
{
Nodes.updateLatency(data.id, data.latency, function (err, latency) {
Nodes.updateLatency(data.id, data.latency, function (err, latency)
{
if(err !== null)
{
console.error('API', 'PIN', 'Latency error:', err);
@ -333,7 +334,7 @@ api.on('connection', function (spark)
}
});
if( Nodes.requiresUpdate(data.id) && (!Nodes.askedForHistory() || _.now() - askedForHistoryTime > 200000) )
if( Nodes.requiresUpdate(data.id) && (!Nodes.askedForHistory() || _.now() - askedForHistoryTime > 2*60*1000) )
{
var range = Nodes.getHistory().getHistoryRequestRange();

3
lib/collection.js
View File

@ -61,7 +61,6 @@ Collection.prototype.addBlock = function(id, stats, callback)
if (!block)
{
console.log(block);
callback('Block undefined', null);
}
else
@ -119,7 +118,7 @@ Collection.prototype.addHistory = function(id, blocks, callback)
this._blockchain.add(blocks[i], id);
};
this.getCharts(callback);
this.getCharts();
}
this.askedForHistory(false);

4
lib/history.js
View File

@ -110,14 +110,14 @@ History.prototype.add = function(block, id)
block.time = 0;
}
if( this._items.length === 0 || block.number >= (this.bestBlockNumber() - MAX_HISTORY + 1) )
{
var item = {
height: block.number,
block: block,
propagTimes: []
}
if( this._items.length === 0 || block.number >= (this.bestBlockNumber() - MAX_HISTORY + 1) )
{
item.propagTimes.push({
node: id,
received: now,

1
lib/node.js
View File

@ -158,7 +158,6 @@ Node.prototype.setBlock = function(block, history, callback)
}
else
{
console.log(block);
callback('Block undefined', null);
}
}