From e0be5ef01b1474abe491398e839429b534ff2e04 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 17 Jun 2014 18:18:45 +0100 Subject: [PATCH 1/2] added timeouts to email and newsletter as after a few days there are a few open connections still --- services/web/app/coffee/Features/Email/EmailSender.coffee | 1 + .../web/app/coffee/Features/Newsletter/NewsletterManager.coffee | 1 + 2 files changed, 2 insertions(+) diff --git a/services/web/app/coffee/Features/Email/EmailSender.coffee b/services/web/app/coffee/Features/Email/EmailSender.coffee index b4b3954d31..680d7708c3 100644 --- a/services/web/app/coffee/Features/Email/EmailSender.coffee +++ b/services/web/app/coffee/Features/Email/EmailSender.coffee @@ -35,6 +35,7 @@ module.exports = subject: options.subject html: options.html replyTo: options.replyTo || Settings.email.replyToAddress + socketTimeout: 30 * 1000 client.sendMail options, (err, res)-> if err? logger.err err:err, "error sending message" diff --git a/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee b/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee index 00297f7e67..8d7eee43bf 100644 --- a/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee +++ b/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee @@ -33,4 +33,5 @@ buildOptions = (user, is_subscribed)-> subscriber_list_id: Settings.markdownmail.list_id is_subscribed: is_subscribed url: "https://www.markdownmail.io/lists/subscribe" + timeout: 30 * 1000 return options \ No newline at end of file From 2a6ff8cc5d4baedffdce31b5ebc265c16913f1cb Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 18 Jun 2014 14:47:29 +0100 Subject: [PATCH 2/2] changed team@sharelatex.com to support@sharelatex.com --- services/web/app.coffee | 2 +- services/web/app/views/general/closed.jade | 2 +- services/web/app/views/restore.jade | 2 +- .../web/app/views/subscriptions/successful_subscription.jade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/web/app.coffee b/services/web/app.coffee index bbc3e6ff53..15f94ca9d9 100644 --- a/services/web/app.coffee +++ b/services/web/app.coffee @@ -19,7 +19,7 @@ Server.app.use (error, req, res, next) -> logger.error err: error, url:req.url, method:req.method, user:req?.sesson?.user, "error passed to top level next middlewear" res.statusCode = error.status or 500 if res.statusCode == 500 - res.end("Oops, something went wrong with your request, sorry. If this continues, please contact us at team@sharelatex.com") + res.end("Oops, something went wrong with your request, sorry. If this continues, please contact us at support@sharelatex.com") else res.end() diff --git a/services/web/app/views/general/closed.jade b/services/web/app/views/general/closed.jade index ce1c3aaf15..1114ea6372 100644 --- a/services/web/app/views/general/closed.jade +++ b/services/web/app/views/general/closed.jade @@ -10,4 +10,4 @@ block content | Sorry, ShareLaTeX is briefly down for maintenance. | We should be back within minutes, but if not, or you have | an urgent request, please contact us at - | team@sharelatex.com + | support@sharelatex.com diff --git a/services/web/app/views/restore.jade b/services/web/app/views/restore.jade index 5644a1302d..51c0ee03fc 100644 --- a/services/web/app/views/restore.jade +++ b/services/web/app/views/restore.jade @@ -15,7 +15,7 @@ block content .well p If any of your projects are missing, or are not showing the most recent updates, you | can recover from our latest back ups here. If you have any problems, please get in - | touch (team@sharelatex.com). + | touch (support@sharelatex.com). .row-fluid table.table diff --git a/services/web/app/views/subscriptions/successful_subscription.jade b/services/web/app/views/subscriptions/successful_subscription.jade index 569490a163..5a8f249f44 100644 --- a/services/web/app/views/subscriptions/successful_subscription.jade +++ b/services/web/app/views/subscriptions/successful_subscription.jade @@ -20,7 +20,7 @@ block content p Thank you for subscribing to the #{subscription.name} plan. It's support from people like yourself that allows ShareLaTeX to continue to grow and improve. p If there is anything you ever need please feel free to contact us directly at - a(href='mailto:team@sharelatex.com') team@sharelatex.com + a(href='mailto:support@sharelatex.com') support@sharelatex.com | - it goes straight to both our inboxes. p Regards, br