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

Fix: Update node data even when skipping.

Browse source 
Also prevents infinite loop as the SELECT to loads the batch
checks modified_at.
This commit is contained in:
baldo 2016-06-29 12:02:46 +02:00
parent 402b6e1156
commit eaaf659674
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
server/services/monitoringService.js
View file

@ -193,7 +193,20 @@ angular.module('ffffng')
callback(null, data);
}
function sendMonitoringMailsBatched(name, mailType, findBatchFun, callback) {
function updateSkippedNode(id, node, callback) {
Database.run(
'UPDATE node_state ' +
'SET hostname = ?, monitoring_state = ?, modified_at = ?' +
'WHERE id = ?',
[
node ? node.hostname : '', node ? node.monitoringState : '', moment().unix(),
id
],
callback
);
}
function sendMonitoringMailsBatched(name, mailType, findBatchFun, callback) {
Logger.tag('monitoring', 'mail-sending').debug('Sending "%s" mails...', name);
var sendNextBatch = function (err) {
@ -230,9 +243,9 @@ angular.module('ffffng')
Logger
.tag('monitoring', 'mail-sending')
.debug(
'Node not found. Skipping sending of "' + name + '" mail: ' + mac
);
return mailCallback(null);
'Node not found. Skipping sending of "' + name + '" mail: ' + mac
);
return updateSkippedNode(nodeState.id, {}, mailCallback);
}
if (node.monitoring && node.monitoringConfirmed) {
@ -278,7 +291,7 @@ angular.module('ffffng')
Logger
.tag('monitoring', 'mail-sending')
.info('Monitoring disabled, skipping "%s" mail for: %s', name, mac);
return mailCallback(null);
return updateSkippedNode(nodeState.id, {}, mailCallback);
}
});
},