diff options
| author | Cristian Bica <cristian.bica@gmail.com> | 2014-08-25 17:34:50 +0300 |
|---|---|---|
| committer | Cristian Bica <cristian.bica@gmail.com> | 2014-09-03 23:01:46 +0300 |
| commit | 1e237b4e44b7de564c7d6b331dd2f2243c4113fd (patch) | |
| tree | c272b813a4968815026d86f6b47ab9839ce3ab03 /actionmailer/lib/action_mailer | |
| parent | 5db4e7f0ec2957f8641d5af884bd39e31d795597 (diff) | |
| download | rails-1e237b4e44b7de564c7d6b331dd2f2243c4113fd.tar.gz rails-1e237b4e44b7de564c7d6b331dd2f2243c4113fd.tar.bz2 rails-1e237b4e44b7de564c7d6b331dd2f2243c4113fd.zip | |
Active Job refactoring
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/message_delivery.rb | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index ce416b09d5..8a6a8b631f 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -98,15 +98,10 @@ module ActionMailer def enqueue_delivery(delivery_method, options={}) args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args - enqueue_method = :enqueue - if options[:at] - enqueue_method = :enqueue_at - args.unshift options[:at] - elsif options[:in] - enqueue_method = :enqueue_in - args.unshift options[:in] - end - ActionMailer::DeliveryJob.send enqueue_method, *args + set_options = {} + set_options[:wait_until] = options[:at] if options[:at] + set_options[:wait] = options[:in] if options[:in] + ActionMailer::DeliveryJob.set(set_options).perform_later(*args) end end end |