dan/wedding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix derp with Rollbar imports

Browse Source
This commit is contained in:
Dan Head
2017-03-05 10:50:05 +00:00
parent 75c0ca06a0
commit f87cd125d5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/emailer.js
View File

@@ -1,6 +1,6 @@
import Nodemailer from 'nodemailer'; import Nodemailer from 'nodemailer';
import { email, starters, mains, getRsvpEnd } from '../config'; import { email, starters, mains, getRsvpEnd } from '../config';
import { handleError } from '../core/rollbar'; import Rollbar from './rollbar';
import Settings from '../data/models/Settings'; import Settings from '../data/models/Settings';
const transporter = Nodemailer.createTransport({ const transporter = Nodemailer.createTransport({
@@ -49,12 +49,12 @@ export const sendRSVPEmail = function sendRSVPEmail(person) {
// send mail with defined transport object // send mail with defined transport object
transporter.sendMail(mailOptions, (error) => { transporter.sendMail(mailOptions, (error) => {
if (error) { if (error) {
handleError(error); Rollbar.handleError(error);
} }
}); });
} }
}).catch(err => { }).catch(err => {
handleError(err); Rollbar.handleError(err);
}); });
}; };
@@ -64,6 +64,6 @@ export const sendRSVPEmailWithDebounce = function sendRSVPEmailWithDebounce(pers
clearTimeout(emailTimers[person.key]); clearTimeout(emailTimers[person.key]);
emailTimers[person.key] = setTimeout(() => { emailTimers[person.key] = setTimeout(() => {
sendRSVPEmail(person); sendRSVPEmail(person);
}, 60000); }, email.debounce);
} }
}; };

12
src/core/slack.js
View File

@@ -1,10 +1,10 @@
import Slack from 'slack-node'; import Slack from 'slack-node';
import { slackWebhook } from '../config'; import { slack as slackCfg } from '../config';
import { handleError } from '../core/rollbar'; import Rollbar from './rollbar';
import Settings from '../data/models/Settings'; import Settings from '../data/models/Settings';
const slack = new Slack(); const slack = new Slack();
slack.setWebhook(slackWebhook); slack.setWebhook(slackCfg.webhook);
// Debounce sending the slack message to avoid spamming // Debounce sending the slack message to avoid spamming
const slackTimers = {}; const slackTimers = {};
@@ -18,12 +18,12 @@ export const sendSlackMsg = function sendSlackMsg(text, channel) {
text, text,
}, err => { }, err => {
if (err) { if (err) {
handleError(err); Rollbar.handleError(err);
} }
}); });
} }
}).catch(err => { }).catch(err => {
handleError(err); Rollbar.handleError(err);
}); });
}; };
@@ -33,6 +33,6 @@ export const sendSlackMsgWithDebounce = function sendSlackMsgWithDebounce(text,
clearTimeout(slackTimers[key]); clearTimeout(slackTimers[key]);
slackTimers[key] = setTimeout(() => { slackTimers[key] = setTimeout(() => {
sendSlackMsg(text, channel); sendSlackMsg(text, channel);
}, 60000); }, slackCfg.debounce);
} }
}; };