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

Added logging framework.

Browse source
This commit is contained in:
baldo 2016-05-24 16:40:57 +02:00
commit a82b66c637
12 changed files with 171 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/jobs/mailQueueJob.js
View file

@ -1,11 +1,11 @@
'use strict';
angular.module('ffffng').factory('MailQueueJob', function (MailService) {
angular.module('ffffng').factory('MailQueueJob', function (MailService, Logger) {
return {
run: function () {
MailService.sendPendingMails(function (err) {
if (err) {
console.error(err);
Logger.tag('mail', 'queue').error('Error sending pending mails:', err);
}
});
}

4
server/jobs/nodeInformationRetrievalJob.js
View file

@ -1,11 +1,11 @@
'use strict';
angular.module('ffffng').factory('NodeInformationRetrievalJob', function (MonitoringService) {
angular.module('ffffng').factory('NodeInformationRetrievalJob', function (MonitoringService, Logger) {
return {
run: function () {
MonitoringService.retrieveNodeInformation(function (err) {
if (err) {
console.error(err);
Logger.tag('monitoring', 'information-retrieval').error('Error retrieving node data:', err);
}
});
}

22
server/jobs/scheduler.js
View file

@ -8,10 +8,12 @@ _.each(jobFiles, function (jobFile) {
require(jobFile);
});
angular.module('ffffng').factory('Scheduler', function ($injector) {
angular.module('ffffng').factory('Scheduler', function ($injector, Logger) {
var cron = require('node-cron');
function schedule(expr, jobName) {
Logger.tag('jobs').info('Scheduling job: ' + expr + ' ' + jobName);
var job = $injector.get(jobName);
if (!_.isFunction(job.run)) {
@ -23,10 +25,20 @@ angular.module('ffffng').factory('Scheduler', function ($injector) {
return {
init: function () {
schedule('*/5 * * * * *', 'MailQueueJob');
// schedule('0 */1 * * * *', 'NodeInformationRetrievalJob');
schedule('*/10 * * * * *', 'NodeInformationRetrievalJob');
// schedule('0 */1 * * * *', 'NodeInformationCleanupJob');
Logger.tag('jobs').info('Scheduling background jobs...');
try {
schedule('0 */1 * * * *', 'MailQueueJob');
// schedule('0 */5 * * * *', 'NodeInformationRetrievalJob');
schedule('*/10 * * * * *', 'NodeInformationRetrievalJob');
// schedule('0 */1 * * * *', 'NodeInformationCleanupJob');
}
catch (error) {
Logger.tag('jobs').error('Error during scheduling of background jobs:', error);
throw error;
}
Logger.tag('jobs').info('Scheduling of background jobs done.');
}
};
});