mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-04-24 21:13:35 -04:00
Merge branch 'master' into production
This commit is contained in:
commit
880b724e4c
2 changed files with 3 additions and 4 deletions
|
@ -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);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -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('&', '&').replace('<', '<').replace('>', '>')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue