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

Mark nodes not listed in nodes.json as offline.

Browse source
This commit is contained in:
baldo 2016-07-29 21:49:03 +02:00
parent 28a1db7c83
commit d63cf55abf
1 changed files with 61 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
server/services/monitoringService.js
View file

@ -96,10 +96,22 @@ angular.module('ffffng')
return callback(err); return callback(err);
} }
if (_.isUndefined(row)) { var nodeDataForStoring;
return insertNodeInformation(nodeData, node, callback); if (nodeData === 'missing') {
nodeDataForStoring = {
mac: node.mac,
state: 'OFFLINE',
lastSeen: _.isUndefined(row) ? moment() : moment.unix(row.last_seen),
importTimestamp: moment()
};
} else { } else {
return updateNodeInformation(nodeData, node, row, callback); nodeDataForStoring = nodeData;
}
if (_.isUndefined(row)) {
return insertNodeInformation(nodeDataForStoring, node, callback);
} else {
return updateNodeInformation(nodeDataForStoring, node, row, callback);
} }
}); });
} }
@ -193,20 +205,20 @@ angular.module('ffffng')
callback(null, data); callback(null, data);
} }
function updateSkippedNode(id, node, callback) { function updateSkippedNode(id, node, callback) {
Database.run( Database.run(
'UPDATE node_state ' + 'UPDATE node_state ' +
'SET hostname = ?, monitoring_state = ?, modified_at = ?' + 'SET hostname = ?, monitoring_state = ?, modified_at = ?' +
'WHERE id = ?', 'WHERE id = ?',
[ [
node ? node.hostname : '', node ? node.monitoringState : '', moment().unix(), node ? node.hostname : '', node ? node.monitoringState : '', moment().unix(),
id id
], ],
callback callback
); );
} }
function sendMonitoringMailsBatched(name, mailType, findBatchFun, callback) { function sendMonitoringMailsBatched(name, mailType, findBatchFun, callback) {
Logger.tag('monitoring', 'mail-sending').debug('Sending "%s" mails...', name); Logger.tag('monitoring', 'mail-sending').debug('Sending "%s" mails...', name);
var sendNextBatch = function (err) { var sendNextBatch = function (err) {
@ -364,6 +376,32 @@ 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
);
});
}
return { return {
getAll: function (restParams, callback) { getAll: function (restParams, callback) {
var sortFields = [ var sortFields = [
@ -569,7 +607,13 @@ angular.module('ffffng')
}); });
}); });
}, },
callback function (err) {
if (err) {
return callback(err);
}
markMissingNodesAsOffline(data.nodes, callback);
}
); );
}); });
}); });