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

email job update only in server

Browse source
This commit is contained in:
vjrj 2018-04-06 13:01:12 +02:00
parent e6a84852fa
commit 1570ef7d44
1 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,9 @@ export const hr = `<table cellspacing="0" cellpadding="0" border="0" width="100%
let MailQueue; let MailQueue;
if (Meteor.settings.private.isMailServer && isMaster()) { const isMailServerMaster = Meteor.settings.private.isMailServer && isMaster();
if (isMailServerMaster) {
console.log('I\'m the mail server'); console.log('I\'m the mail server');
MailQueue = new MailTime({ MailQueue = new MailTime({
db, db,
@ -31,10 +33,10 @@ if (Meteor.settings.private.isMailServer && isMaster()) {
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) {
// To pass spam-filters `from` field should be correctly set // To pass spam-filters `from` field should be correctly set
// for each transport, check `transport` object for more options // for each transport, check `transport` object for more options
if (!Meteor.isProduction) { if (!Meteor.isProduction) {
// only for test purposes // only for test purposes
return `${i18n.t('AppName')} <notify@example.org>`; return `${i18n.t('AppName')} <notify@example.org>`;
} }
return `${i18n.t('AppName')} <${transport.options.auth.user}>`; return `${i18n.t('AppName')} <${transport.options.auth.user}>`;
@ -43,8 +45,8 @@ if (Meteor.settings.private.isMailServer && isMaster()) {
concatEmails: true, // Concatenate emails to the same addressee concatEmails: true, // Concatenate emails to the same addressee
concatSubject: `${i18n.t('Nuevas notificaciones de {{app}}', { app: i18n.t('AppName') })}`, concatSubject: `${i18n.t('Nuevas notificaciones de {{app}}', { app: i18n.t('AppName') })}`,
/* eslint-disable */ /* eslint-disable */
concatDelimiter: hr + '<h2>{{{subject}}}</h2>', // Start each concatenated email with it's own subject concatDelimiter: hr + '<h2>{{{subject}}}</h2>', // Start each concatenated email with it's own subject
/* eslint-enable */ /* eslint-enable */
// concatThrottling: 30, // concatThrottling: 30,
template: MailTime.Template // Use default template template: MailTime.Template // Use default template
}); });
@ -84,30 +86,31 @@ if (Meteor.settings.private.testMailer) {
sendMail(emailOpts, true); sendMail(emailOpts, true);
} }
if (isMailServerMaster) {
// Set interval to greater than 256
// https://github.com/VeliovGroup/Mail-Time/issues/5
const MailJobs = new Mongo.Collection('__JobTasks__mailTimeQueue', { idGeneration: 'MONGO' });
// Set interval to greater than 256 const updateJob = (mailJob, updated) => {
// https://github.com/VeliovGroup/Mail-Time/issues/5 const delay = 60000;
const MailJobs = new Mongo.Collection('__JobTasks__mailTimeQueue', { idGeneration: 'MONGO' }); 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 updateJob = (mailJob, updated) => { const mailJob = MailJobs.findOne();
const delay = 60000;
if (Meteor.isDevelopment) console.log(`${updated ? 'Update old' : 'Update just added'} mailjob with ${delay} delay`); if (mailJob) {
if (mailJob.delay !== delay) { updateJob(mailJob);
MailJobs.update(mailJob._id, { $set: { delay } });
} }
};
const mailJob = MailJobs.findOne(); MailJobs.find().observe({
added: function notifAdded(item) {
if (mailJob) { updateJob(item, false);
updateJob(mailJob); },
changed: function notifChanged(item) {
updateJob(item, true);
}
});
} }
MailJobs.find().observe({
added: function notifAdded(item) {
updateJob(item, false);
},
changed: function notifChanged(item) {
updateJob(item, true);
}
});