Dumb down ActionMailer integration, fixes sidekiq#2149

wking1986 · Jan 23, 2015 · a7ddb44 · a7ddb44
1 parent f074cce
commit a7ddb44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,7 @@
 HEAD
 -----------
+
+- Dumb down ActionMailer integration so it tries to deliver if possible [#2149]
 - Stringify Sidekiq.default_worker_options's keys [#2126]
 - Add random integer to process identity [#2113, michaeldiscala]
 - Log Sidekiq Pro's Batch ID if available [#2076]

diff --git a/lib/sidekiq/extensions/action_mailer.rb b/lib/sidekiq/extensions/action_mailer.rb
@@ -17,7 +17,11 @@ def perform(yml)
         msg = target.public_send(method_name, *args)
         # The email method can return nil, which causes ActionMailer to return
         # an undeliverable empty message.
-        deliver(msg) if msg && (msg.to || msg.cc || msg.bcc) && msg.from
+        if msg
+          deliver(msg)
+        else
+          logger.warn("#{target.name}##{method_name} returned an undeliverable mail object")
+        end
       end
 
       private