Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue #889 - Sending emails fails sometimes because of wrong used channel/sender email address.

Browse source
This commit is contained in:
Martin Edenhofer 2017-03-24 17:43:09 +01:00
parent 56216a0dd4
commit adbe490e54
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/models/observer/ticket/article/communicate_email/background_job.rb
View file

@ -22,13 +22,29 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
record.preferences['delivery_retry'] += 1
# send email
email_address = nil
if record.preferences['email_address_id'].present?
email_address = EmailAddress.find_by(id: record.preferences['email_address_id'])
end
# fallback for articles without email_address_id
if !email_address
if !ticket.group.email_address_id
log_error(record, "No email address defined for group id '#{ticket.group.id}'!")
elsif !ticket.group.email_address.channel_id
log_error(record, "No channel defined for email_address id '#{ticket.group.email_address_id}'!")
end
email_address = ticket.group.email_address
end
channel = ticket.group.email_address.channel
# log if ref objects are missing
if !email_address
log_error(record, "No email address defined for group id '#{ticket.group_id}'!")
end
if !email_address.channel_id
log_error(record, "No channel defined for email_address id '#{email_address.id}'!")
end
channel = email_address.channel
notification = false
sender = Ticket::Article::Sender.lookup(id: record.sender_id)
@ -54,15 +70,16 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
notification
)
rescue => e
log_error(record, e.message)
log_error(record, e.message, channel)
return
end
if !message
log_error(record, 'Unable to get sent email')
log_error(record, 'Unable to get sent email', channel)
return
end
# set delivery status
record.preferences['delivery_channel_id'] = channel.id
record.preferences['delivery_status_message'] = nil
record.preferences['delivery_status'] = 'success'
record.preferences['delivery_status_date'] = Time.zone.now
@ -100,7 +117,10 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
)
end
def log_error(local_record, message)
def log_error(local_record, message, channel = nil)
if channel
record.preferences['delivery_channel_id'] = channel.id
end
local_record.preferences['delivery_status'] = 'fail'
local_record.preferences['delivery_status_message'] = message
local_record.preferences['delivery_status_date'] = Time.zone.now

5
app/models/observer/ticket/article/fillup_from_email.rb
View file

@ -46,6 +46,11 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer
if !email_address
raise "No email address found for group '#{ticket.group.name}'"
end
# remember email address for background job
record.preferences['email_address_id'] = email_address.id
# fill from
if record.created_by_id != 1 && Setting.get('ticket_define_email_from') == 'AgentNameSystemAddressName'
separator = Setting.get('ticket_define_email_from_separator')
sender = User.find(record.created_by_id)