sidekiq 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f90dbb4ffba7f12619e992cdd36e92c0c26c90
-  data.tar.gz: c5a9d6faf0ae1d1aa6b2ecb65b2adc282032a5aa
+  metadata.gz: c6b396eed600fb9d68a2fb2cfee12ee9ba467fac
+  data.tar.gz: 8effaeb6349a48abe2339611bf57d0d024ed3b61
 SHA512:
-  metadata.gz: 730a5cd70e49741c0426ee7f7d467939f72adae0ea276c00cc45cf331e48794fe8c40d1d84c4432c0d92c20bf7f795c06be775c2cae26e98170967673922c302
-  data.tar.gz: 6261ef3999c2a4ad2674172ce1c84d4bef1fb172c0952994aa0232f943e7671add7c72984f381b3c4a7198a723f72cc3362abc6a81baee136e162992ee63f3b7
+  metadata.gz: 13dbbabcb09208a493d43b8f8cd6085a2e7ad62171ec831a4413d33797f768fb692d66767a53bf8938850f7df7a1894621ce1d8bd3945795bc8376d258cd5a9c
+  data.tar.gz: 01f0b7d88720d8a44989f17ec4f6f8f2680caa42a496e3e172899f8db5c8a87432617b3d5482b09a6ea78fc85e2c63e5e4928f49a5791a6a7970e48978e5b108

data/Changes.md

@@ -1,3 +1,9 @@
+3.2.4
+-----------
+
+- Fix issue preventing ActionMailer sends working in some cases with
+  Rails 4. [pbhogan, #1923]
+
 3.2.3
 -----------
 

data/lib/sidekiq/extensions/action_mailer.rb

@@ -14,7 +14,7 @@ module Sidekiq
 
       def perform(yml)
         (target, method_name, args) = YAML.load(yml)
-        msg = target.__send__(method_name, *args)
+        msg = target.public_send(method_name, *args)
         # The email method can return nil, which causes ActionMailer to return
         # an undeliverable empty message.
         msg.deliver if msg && (msg.to || msg.cc || msg.bcc) && msg.from

data/lib/sidekiq/middleware/server/retry_jobs.rb

@@ -80,6 +80,12 @@ module Sidekiq
           raise Sidekiq::Shutdown if exception_caused_by_shutdown?(e)
 
           raise e unless msg['retry']
+          attempt_retry(worker, msg, queue, e)
+        end
+
+        private
+
+        def attempt_retry(worker, msg, queue, exception)
           max_retry_attempts = retry_attempts_from(msg['retry'], @max_retries)
 
           msg['queue'] = if msg['retry_queue']
@@ -90,14 +96,14 @@ module Sidekiq
 
           # App code can stuff all sorts of crazy binary data into the error message
           # that won't convert to JSON.
-          m = e.message[0..10_000]
+          m = exception.message[0..10_000]
           if m.respond_to?(:scrub!)
             m.force_encoding("utf-8")
             m.scrub!
           end
 
           msg['error_message'] = m
-          msg['error_class'] = e.class.name
+          msg['error_class'] = exception.class.name
           count = if msg['retry_count']
             msg['retried_at'] = Time.now.to_f
             msg['retry_count'] += 1
@@ -107,11 +113,11 @@ module Sidekiq
           end
 
           if msg['backtrace'] == true
-            msg['error_backtrace'] = e.backtrace
+            msg['error_backtrace'] = exception.backtrace
           elsif msg['backtrace'] == false
             # do nothing
           elsif msg['backtrace'].to_i != 0
-            msg['error_backtrace'] = e.backtrace[0..msg['backtrace'].to_i]
+            msg['error_backtrace'] = exception.backtrace[0..msg['backtrace'].to_i]
           end
 
           if count < max_retry_attempts
@@ -127,11 +133,9 @@ module Sidekiq
             retries_exhausted(worker, msg)
           end
 
-          raise e
+          raise exception
         end
 
-        private
-
         def retries_exhausted(worker, msg)
           logger.debug { "Dropping message after hitting the retry maximum: #{msg}" }
           begin

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.2.3"
+  VERSION = "3.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis