freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: Avoid duplicates from different nodes.json files. Use only newest.

Browse source
This commit is contained in:
baldo 2017-03-19 16:31:50 +01:00
parent d7555dfad1
commit 231eec3544
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server/services/monitoringService.js
View file

@ -465,11 +465,19 @@ angular.module('ffffng')
// We do not parallelize here as the sqlite will start slowing down and blocking with too many // We do not parallelize here as the sqlite will start slowing down and blocking with too many
// parallel queries. This has resulted in blocking other requests too and thus in a major slowdonw. // parallel queries. This has resulted in blocking other requests too and thus in a major slowdonw.
var nodes = _.flatMap(datas, function (data) { var allNodes = _.flatMap(datas, function (data) {
return data.nodes; return data.nodes;
}); });
// Get rid of duplicates from different nodes.json files. Always use the one with the newest
var sortedNodes = _.orderBy(allNodes, [function (node) {
return node.lastSeen.unix();
}], ['desc']);
var uniqueNodes = _.uniqBy(sortedNodes, function (node) {
return node.mac;
});
async.eachSeries( async.eachSeries(
nodes, uniqueNodes,
function (nodeData, nodeCallback) { function (nodeData, nodeCallback) {
Logger.tag('monitoring', 'information-retrieval').debug('Importing: %s', nodeData.mac); Logger.tag('monitoring', 'information-retrieval').debug('Importing: %s', nodeData.mac);
@ -509,7 +517,7 @@ angular.module('ffffng')
return callback(err); return callback(err);
} }
markMissingNodesAsOffline(nodes, callback); markMissingNodesAsOffline(uniqueNodes, callback);
} }
); );
}); });