diff options
-rw-r--r-- | actionmailer/lib/action_mailer/async.rb | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/async.rb b/actionmailer/lib/action_mailer/async.rb index 6f768ac286..cbadd3dc25 100644 --- a/actionmailer/lib/action_mailer/async.rb +++ b/actionmailer/lib/action_mailer/async.rb @@ -26,10 +26,12 @@ module ActionMailer::Async actual_message.deliver end + # Will push the message onto the Queue to be processed def deliver Rails.queue << self end + # The original ActionMailer message def actual_message @actual_message ||= @mailer_class.send(:new, @method_name, *@args).message end diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f40b85549e..5686e78dfc 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -456,6 +456,7 @@ module ActionMailer #:nodoc: super || action_methods.include?(method.to_s) end + # Will force ActionMailer to push new messages to the Rails.queue def async=(truth) if truth require 'action_mailer/async' |