Project

General

Profile

Patch #9102 ยป 0001-Dry-up-MailHandler-logging.patch

Alex Shulgin, 2011-08-22 22:02

View differences:

app/models/mail_handler.rb
attr_reader :email, :user
def logger
@logger = super || Logger.new(nil)
end
def self.receive(email, options={})
@@handler_options = options.dup
......
sender_email = email.from.to_a.first.to_s.strip
# Ignore emails received from the application emission address to avoid hell cycles
if sender_email.downcase == Setting.mail_from.to_s.strip.downcase
logger.info "MailHandler: ignoring email from Redmine emission address [#{sender_email}]" if logger && logger.info
logger.info "MailHandler: ignoring email from Redmine emission address [#{sender_email}]"
return false
end
@user = User.find_by_mail(sender_email) if sender_email.present?
if @user && !@user.active?
logger.info "MailHandler: ignoring email from non-active user [#{@user.login}]" if logger && logger.info
logger.info "MailHandler: ignoring email from non-active user [#{@user.login}]"
return false
end
if @user.nil?
......
when 'create'
@user = MailHandler.create_user_from_email(email)
if @user
logger.info "MailHandler: [#{@user.login}] account created" if logger && logger.info
logger.info "MailHandler: [#{@user.login}] account created"
Mailer.deliver_account_information(@user, @user.password)
else
logger.error "MailHandler: could not create account for [#{sender_email}]" if logger && logger.error
logger.error "MailHandler: could not create account for [#{sender_email}]"
return false
end
else
# Default behaviour, emails from unknown users are ignored
logger.info "MailHandler: ignoring email from unknown user [#{sender_email}]" if logger && logger.info
logger.info "MailHandler: ignoring email from unknown user [#{sender_email}]"
return false
end
end
......
end
rescue ActiveRecord::RecordInvalid => e
# TODO: send a email to the user
logger.error e.message if logger
logger.error e.message
false
rescue MissingInformation => e
logger.error "MailHandler: missing information from #{user}: #{e.message}" if logger
logger.error "MailHandler: missing information from #{user}: #{e.message}"
false
rescue UnauthorizedAction => e
logger.error "MailHandler: unauthorized attempt from #{user}" if logger
logger.error "MailHandler: unauthorized attempt from #{user}"
false
end
......
# to save the record to trigger an issue update mail.
issue.save!
end
logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
logger.info "MailHandler: issue ##{issue.id} created by #{user}"
issue
end
......
journal.notes = cleaned_up_text_body
add_attachments(issue)
issue.save!
logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
logger.info "MailHandler: issue ##{issue.id} updated by #{user}"
journal
end
......
add_attachments(reply)
reply
else
logger.info "MailHandler: ignoring reply from [#{sender_email}] to a locked topic" if logger && logger.info
logger.info "MailHandler: ignoring reply from [#{sender_email}] to a locked topic"
end
end
end
    (1-1/1)