Merge branch 'master' into production

This commit is contained in:
Rob 2016-09-21 14:46:22 -07:00
commit 880b724e4c
2 changed files with 3 additions and 4 deletions

View file

@ -93,7 +93,7 @@ const parseDomain = require('parse-domain');
const request = require('request');
const earliestDate = new Date();
earliestDate.setUTCDate(earliestDate.getUTCDate() - 3);
earliestDate.setUTCDate(earliestDate.getUTCDate() - 10);
const apiKeyEmailMap = {};
const emailApiKeyMap = {};
@ -121,13 +121,12 @@ function upsertLeads(done) {
if (err) return done(err);
updateCloseApiKeyMaps((err) => {
if (err) return done(err);
// log('DEBUG: Updating contacts..');
updateCloseLeads(contacts, (err) => {
return done(err);
});
return done(err);
});
});
});

View file

@ -28,7 +28,7 @@ module.exports.sendSlackMessage = (message, rooms=['tower'], options={}) ->
unfurl_media: false
if options.papertrail
secondsFromEpoch = Math.floor(new Date().getTime() / 1000)
link = "https://papertrailapp.com/groups/488214/events?time=#{secondsFromEpoch}"
link = "https://app.logdna.com/logs/view?t=timestamp:#{secondsFromEpoch}"
form.text += " #{link}"
# https://api.slack.com/docs/formatting
form.text = form.text.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')