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

Simplify and improve marking missing nodes as offline.

Browse source
This commit is contained in:
baldo 2017-08-13 19:30:30 +02:00
parent 8628bee9e9
commit 950daf6939
1 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
server/services/monitoringService.js
View file

@ -412,32 +412,6 @@ angular.module('ffffng')
);
}
function markMissingNodesAsOffline(nodes, callback) {
var knownNodes = {};
_.each(nodes, function (node) {
knownNodes[Strings.normalizeMac(node.mac)] = 1;
});
NodeService.getAllNodes(function (err, nodes) {
if (err) {
return callback(err);
}
async.eachSeries(
nodes,
function (node, nodeCallback) {
if (knownNodes[Strings.normalizeMac(node.mac)]) {
// node is known in nodes.json so it has already been handled
return nodeCallback(null);
}
storeNodeInformation('missing', node, nodeCallback);
},
callback
);
});
}
function withUrlsData(urls, callback) {
async.map(urls, function (url, urlCallback) {
Logger.tag('monitoring', 'information-retrieval').debug('Retrieving nodes.json: %s', url);
@ -465,10 +439,14 @@ angular.module('ffffng')
}
var maxTimestamp = datas[0].importTimestamp;
var minTimestamp = maxTimestamp;
_.each(datas, function (data) {
if (data.importTimestamp.isAfter(maxTimestamp)) {
maxTimestamp = data.importTimestamp;
}
if (data.importTimestamp.isBefore(minTimestamp)) {
minTimestamp = data.importTimestamp;
}
});
if (previousImportTimestamp !== null && !maxTimestamp.isAfter(previousImportTimestamp)) {
@ -537,7 +515,17 @@ angular.module('ffffng')
return callback(err);
}
markMissingNodesAsOffline(uniqueNodes, callback);
// Mark nodes as offline that haven't been imported in this run.
Database.run(
'UPDATE node_state ' +
'SET state = ?, modified_at = ?' +
'WHERE import_timestamp < ?',
[
'OFFLINE', moment().unix(),
minTimestamp
],
callback
);
}
);
});