added history request timeout
This commit is contained in:
parent
735cd103b0
commit
f7186e0b3c
7
app.js
7
app.js
@ -4,6 +4,7 @@ var path = require('path');
|
|||||||
var favicon = require('serve-favicon');
|
var favicon = require('serve-favicon');
|
||||||
var bodyParser = require('body-parser');
|
var bodyParser = require('body-parser');
|
||||||
var askedForHistory = false;
|
var askedForHistory = false;
|
||||||
|
var askedForHistoryTime = 0;
|
||||||
|
|
||||||
var Primus = require('primus'),
|
var Primus = require('primus'),
|
||||||
api,
|
api,
|
||||||
@ -63,13 +64,14 @@ api.on('connection', function(spark) {
|
|||||||
var info = Nodes.add(data);
|
var info = Nodes.add(data);
|
||||||
spark.emit('ready');
|
spark.emit('ready');
|
||||||
|
|
||||||
if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id))
|
if(Nodes.getHistory().requiresUpdate() && Nodes.canNodeUpdate(data.id) && (!askedForHistory || (new Date()).getTime() - askedForHistoryTime > 120000))
|
||||||
{
|
{
|
||||||
var range = Nodes.getHistory().getHistoryRequestInterval();
|
var range = Nodes.getHistory().getHistoryRequestInterval();
|
||||||
console.log("asked " + data.id + " for history");
|
console.log("asked " + data.id + " for history");
|
||||||
console.log('interval', range);
|
console.log('interval', range);
|
||||||
spark.emit('history', range);
|
spark.emit('history', range);
|
||||||
askedForHistory = true;
|
askedForHistory = true;
|
||||||
|
askedForHistoryTime = (new Date()).getTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
client.write({action: 'add', data: info});
|
client.write({action: 'add', data: info});
|
||||||
@ -90,13 +92,14 @@ api.on('connection', function(spark) {
|
|||||||
client.write({action: 'charts', data: Nodes.getCharts()});
|
client.write({action: 'charts', data: Nodes.getCharts()});
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Nodes.getHistory().requiresUpdate() && !askedForHistory && Nodes.canNodeUpdate(data.id))
|
if(Nodes.getHistory().requiresUpdate() && Nodes.canNodeUpdate(data.id) && (!askedForHistory || (new Date()).getTime() - askedForHistoryTime > 120000))
|
||||||
{
|
{
|
||||||
var range = Nodes.getHistory().getHistoryRequestInterval();
|
var range = Nodes.getHistory().getHistoryRequestInterval();
|
||||||
console.log("asked " + data.id + " for history");
|
console.log("asked " + data.id + " for history");
|
||||||
console.log('interval', range);
|
console.log('interval', range);
|
||||||
spark.emit('history', range);
|
spark.emit('history', range);
|
||||||
askedForHistory = true;
|
askedForHistory = true;
|
||||||
|
askedForHistoryTime = (new Date()).getTime();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user