comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Email sending by our cron

Browse source
This commit is contained in:
vjrj 2018-04-06 17:20:35 +02:00
parent 1570ef7d44
commit 61339f4eb2
2 changed files with 44 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

20
imports/startup/server/cron.js
View file

@ -3,6 +3,7 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { tweetIberiaFires, tweetEuropeFires } from '/imports/api/ActiveFires/server/tweetFiresInZone'; import { tweetIberiaFires, tweetEuropeFires } from '/imports/api/ActiveFires/server/tweetFiresInZone';
import { isMailServerMaster, sendEmailsFromQueue } from '/imports/startup/server/email';
// https://github.com/thesaucecode/meteor-synced-cron/ // https://github.com/thesaucecode/meteor-synced-cron/
@ -36,6 +37,22 @@ Meteor.startup(() => {
// collectionTTL: 172800 // collectionTTL: 172800
}); });
if (isMailServerMaster) {
SyncedCron.add({
name: 'Send emails',
timezone: 'Europe/Madrid',
schedule: (parser) => {
// http://bunkat.github.io/later/
const sched = parser.text('every 1 min');
if (sched.error !== -1) {
console.error(`Mail cron 'when' field parsed with errors: ${sched.error}`);
}
return sched;
},
job: () => sendEmailsFromQueue()
});
}
const esEn = Meteor.settings.private.twitter.es.enabled; const esEn = Meteor.settings.private.twitter.es.enabled;
const enEn = Meteor.settings.private.twitter.en.enabled; const enEn = Meteor.settings.private.twitter.en.enabled;
@ -84,7 +101,8 @@ Meteor.startup(() => {
}); });
} }
if (esEn || enEn) {
if (isMailServerMaster || esEn || enEn) {
SyncedCron.start(); SyncedCron.start();
} }
}); });

35
imports/startup/server/email.js
View file

@ -1,5 +1,4 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Mongo } from 'meteor/mongo';
import nodemailer from 'nodemailer'; import nodemailer from 'nodemailer';
import { MailTime } from 'meteor/ostrio:mailer'; import { MailTime } from 'meteor/ostrio:mailer';
import i18n from 'i18next'; import i18n from 'i18next';
@ -23,13 +22,14 @@ export const hr = `<table cellspacing="0" cellpadding="0" border="0" width="100%
let MailQueue; let MailQueue;
const isMailServerMaster = Meteor.settings.private.isMailServer && isMaster(); export const isMailServerMaster = Meteor.settings.private.isMailServer && isMaster();
if (isMailServerMaster) { if (isMailServerMaster) {
console.log('I\'m the mail server'); console.log('I\'m the mail server');
MailQueue = new MailTime({ MailQueue = new MailTime({
db, db,
type: 'server', type: 'client', // instead of 'server' for now to avoid use the JosK task manager at 250ms, we use our cron
// see https://github.com/VeliovGroup/Mail-Time/issues/5
strategy: 'balancer', // Transports will be used in round robin chain strategy: 'balancer', // Transports will be used in round robin chain
transports, transports,
from(transport) { from(transport) {
@ -86,31 +86,6 @@ if (Meteor.settings.private.testMailer) {
sendMail(emailOpts, true); sendMail(emailOpts, true);
} }
if (isMailServerMaster) { export const sendEmailsFromQueue = () => {
// Set interval to greater than 256 MailQueue.___send(() => { });
// https://github.com/VeliovGroup/Mail-Time/issues/5
const MailJobs = new Mongo.Collection('__JobTasks__mailTimeQueue', { idGeneration: 'MONGO' });
const updateJob = (mailJob, updated) => {
const delay = 60000;
if (Meteor.isDevelopment) console.log(`${updated ? 'Update old' : 'Update just added'} mailjob with ${delay} delay`);
if (mailJob.delay !== delay) {
MailJobs.update(mailJob._id, { $set: { delay } });
}
}; };
const mailJob = MailJobs.findOne();
if (mailJob) {
updateJob(mailJob);
}
MailJobs.find().observe({
added: function notifAdded(item) {
updateJob(item, false);
},
changed: function notifChanged(item) {
updateJob(item, true);
}
});
}