Fix: Update node data even when skipping.
Also prevents infinite loop as the SELECT to loads the batch checks modified_at.
This commit is contained in:
parent
402b6e1156
commit
eaaf659674
|
@ -193,6 +193,19 @@ angular.module('ffffng')
|
||||||
callback(null, data);
|
callback(null, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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) {
|
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);
|
||||||
|
|
||||||
|
@ -232,7 +245,7 @@ angular.module('ffffng')
|
||||||
.debug(
|
.debug(
|
||||||
'Node not found. Skipping sending of "' + name + '" mail: ' + mac
|
'Node not found. Skipping sending of "' + name + '" mail: ' + mac
|
||||||
);
|
);
|
||||||
return mailCallback(null);
|
return updateSkippedNode(nodeState.id, {}, mailCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (node.monitoring && node.monitoringConfirmed) {
|
if (node.monitoring && node.monitoringConfirmed) {
|
||||||
|
@ -278,7 +291,7 @@ angular.module('ffffng')
|
||||||
Logger
|
Logger
|
||||||
.tag('monitoring', 'mail-sending')
|
.tag('monitoring', 'mail-sending')
|
||||||
.info('Monitoring disabled, skipping "%s" mail for: %s', name, mac);
|
.info('Monitoring disabled, skipping "%s" mail for: %s', name, mac);
|
||||||
return mailCallback(null);
|
return updateSkippedNode(nodeState.id, {}, mailCallback);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue