mirror of
https://github.com/lingble/chatwoot.git
synced 2025-10-29 18:22:53 +00:00
fix: Disable marking IMAP connection as invalid for Standard Errors (#4764)
This commit is contained in:
@@ -6,13 +6,12 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
|
||||
def perform(channel)
|
||||
return unless should_fetch_email?(channel)
|
||||
|
||||
process_mail_for_channel(channel)
|
||||
fetch_mail_for_channel(channel)
|
||||
# clearing old failures like timeouts since the mail is now successfully processed
|
||||
channel.reauthorized!
|
||||
rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::IMAP::NoResponseError
|
||||
channel.authorization_error!
|
||||
rescue StandardError => e
|
||||
channel.authorization_error!
|
||||
ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
|
||||
end
|
||||
|
||||
@@ -22,7 +21,7 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
|
||||
channel.imap_enabled? && !channel.reauthorization_required?
|
||||
end
|
||||
|
||||
def process_mail_for_channel(channel)
|
||||
def fetch_mail_for_channel(channel)
|
||||
# TODO: rather than setting this as default method for all mail objects, lets if can do new mail object
|
||||
# using Mail.retriever_method.new(params)
|
||||
Mail.defaults do
|
||||
@@ -36,12 +35,18 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
|
||||
new_mails = false
|
||||
|
||||
Mail.find(what: :last, count: 10, order: :desc).each do |inbound_mail|
|
||||
if inbound_mail.date.utc >= channel.imap_inbox_synced_at
|
||||
Imap::ImapMailbox.new.process(inbound_mail, channel)
|
||||
new_mails = true
|
||||
end
|
||||
next unless inbound_mail.date.utc >= channel.imap_inbox_synced_at
|
||||
|
||||
process_mail(inbound_mail, channel)
|
||||
new_mails = true
|
||||
end
|
||||
|
||||
channel.update(imap_inbox_synced_at: Time.now.utc) if new_mails
|
||||
end
|
||||
|
||||
def process_mail(inbound_mail, channel)
|
||||
Imap::ImapMailbox.new.process(inbound_mail, channel)
|
||||
rescue StandardError => e
|
||||
ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
|
||||
end
|
||||
end
|
||||
|
||||
@@ -12,8 +12,11 @@ class ChatwootExceptionTracker
|
||||
end
|
||||
|
||||
def capture_exception
|
||||
capture_exception_with_sentry if ENV['SENTRY_DSN'].present?
|
||||
# Implement other providers like honeybadger, rollbar etc in future
|
||||
if ENV['SENTRY_DSN'].present?
|
||||
capture_exception_with_sentry
|
||||
else
|
||||
Rails.logger.error @exception
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe ChatwootExceptionTracker do
|
||||
it 'returns nil if no tracker is configured' do
|
||||
expect(described_class.new('random').capture_exception).to eq(nil)
|
||||
it 'use rails logger if no tracker is configured' do
|
||||
expect(Rails.logger).to receive(:error).with('random')
|
||||
described_class.new('random').capture_exception
|
||||
end
|
||||
|
||||
context 'with sentry DSN' do
|
||||
|
||||
Reference in New Issue
Block a user