From a732daebc5d78620224cfd8053125269a9d2e5f9 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 31 Jan 2018 17:03:35 +0100 Subject: [PATCH] Update mailer and reconfigure interval --- .meteor/versions | 2 +- imports/startup/server/email.js | 31 ++++++++++++++++++++++++++----- package-lock.json | 6 +++--- package.json | 2 +- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index f1dde1a..edcd34a 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -95,7 +95,7 @@ oauth2@1.2.0 observe-sequence@1.0.16 ordered-dict@1.0.9 ostrio:cookies@2.1.3 -ostrio:mailer@2.0.6 +ostrio:mailer@2.1.0 ostrio:meteor-root@1.0.6 peerlibrary:assert@0.2.5 peerlibrary:fiber-utils@0.6.0 diff --git a/imports/startup/server/email.js b/imports/startup/server/email.js index c514fff..c38618c 100644 --- a/imports/startup/server/email.js +++ b/imports/startup/server/email.js @@ -1,10 +1,9 @@ import { Meteor } from 'meteor/meteor'; +import { Mongo } from 'meteor/mongo'; import nodemailer from 'nodemailer'; import { MailTime } from 'meteor/ostrio:mailer'; import i18n from 'i18next'; -// console.log(i18n.t('Inicio del mailer')); - const transports = []; // First transport @@ -14,9 +13,6 @@ transports.push(fstTransport); const db = Meteor.users.rawDatabase(); // new Mongo.Collection('__mailTimeQueue__').rawDatabase(); -// Use __mailTimeQueue collection in any db -// db.getCollection("__mailTimeQueue__").count() - // https://litmus.com/community/discussions/4633-is-there-a-reliable-1px-horizontal-rule-method export const hr = ` @@ -81,3 +77,28 @@ if (Meteor.settings.private.testMailer) { sendMail(emailOpts, true); sendMail(emailOpts, true); } + + +// Set interval to greater than 256 +// https://github.com/VeliovGroup/Mail-Time/issues/5 +const MailJobs = new Mongo.Collection('__JobTasks__mailTimeQueue', { idGeneration: 'MONGO' }); + +const updateJob = (mailJob) => { + MailJobs.update(mailJob._id, { $set: { delay: 30000 } }); + // console.log(MailJobs.findOne()); +}; + +const mailJob = MailJobs.findOne(); + +if (mailJob) { + updateJob(mailJob); +} + +MailJobs.find().observe({ + added: function notifAdded(item) { + updateJob(item); + }, + changed: function notifChanged(item) { + updateJob(item); + } +}); diff --git a/package-lock.json b/package-lock.json index 0d52f89..2fdde13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8863,9 +8863,9 @@ "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" }, "nodemailer": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.4.1.tgz", - "integrity": "sha512-1bnszJJXatcHJhLpxQ1XMkLDjCjPKvGKMtRQ73FOsoNln3UQjddEQmz6fAwM3aj0GtQ3dQX9qtMHPelz63GU7A==" + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.4.2.tgz", + "integrity": "sha512-sstDxbCSPHDXrWRQhH++khr3yVU0CGvH2dCtAHOPQQ0lRR7xwq2txItEXckMpX481B/cN+0akER2bfExh7Gu/Q==" }, "nomnom": { "version": "1.6.2", diff --git a/package.json b/package.json index dc78d0f..f538f79 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "moment": "^2.19.1", "moment-timezone": "^0.5.14", "node-geocoder": "^3.21.1", - "nodemailer": "^4.4.1", + "nodemailer": "^4.4.2", "popper.js": "^1.12.7", "prop-types": "^15.6.0", "push.js": "^1.0.5",