github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 15:05:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2486 from riking/no_group_messages

Browse Source 
Change pop3 auth errors from admin message to dashboard notice
This commit is contained in:
Sam 2014-07-01 10:02:19 +10:00
commit 20074a3140
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/jobs/scheduled/poll_mailbox.rb
View File

@ -47,7 +47,7 @@ module Jobs
client_message = RejectionMailer.send_rejection(message.from, message.body, message.to, message_template)
Email::Sender.new(client_message, message_template).send
else
Discourse.handle_exception(e, { context: "incoming email", mail: mail_string })
Discourse.handle_exception(e, { code: "unknown error for incoming email", mail: mail_string} )
end
ensure
mail.delete
@ -70,9 +70,7 @@ module Jobs
pop.finish
end
rescue Net::POPAuthenticationError => e
# inform admins about the error (1 message per hour to prevent too much SPAM)
data = { limit_once_per: 1.hour, message_params: { error: e }}
GroupMessage.create(Group[:admins].name, :email_error_notification, data)
Discourse.handle_exception(e, { code: "signing in for incoming email" } )
end
end

5
spec/jobs/poll_mailbox_spec.rb
View File

@ -28,12 +28,13 @@ describe Jobs::PollMailbox do
describe ".poll_pop3s" do
it "informs admins on pop authentication error" do
it "logs an error on pop authentication error" do
error = Net::POPAuthenticationError.new
data = { limit_once_per: 1.hour, message_params: { error: error }}
Net::POP3.expects(:start).raises(error)
GroupMessage.expects(:create).with("admins", :email_error_notification, data)
Discourse.expects(:handle_exception)
poller.poll_pop3s
end