From 9e9c81c30bf6a86ecb7fcc89667b3caa5146a142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 25 Mar 2016 16:44:08 +0100 Subject: [PATCH] improve error log when timing out while connecting to mail server --- app/jobs/scheduled/poll_mailbox.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb index 03193837fd9..320b9858830 100644 --- a/app/jobs/scheduled/poll_mailbox.rb +++ b/app/jobs/scheduled/poll_mailbox.rb @@ -96,9 +96,12 @@ module Jobs process_popmail(p) end end + rescue Net::OpenTimeout => e + mark_as_errored! + Discourse.handle_job_exception(e, error_context(@args, "Connecting to '#{SiteSetting.pop3_polling_host}' for polling emails.")) rescue Net::POPAuthenticationError => e mark_as_errored! - Discourse.handle_job_exception(e, error_context(@args, "Signing in to poll incoming email")) + Discourse.handle_job_exception(e, error_context(@args, "Signing in to poll incoming emails.")) end POLL_MAILBOX_ERRORS_KEY ||= "poll_mailbox_errors".freeze