sidekiq 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5611a44077288f2a7a7c1e46d4fdf39aa05be0f
-  data.tar.gz: 7c406cd5d25b49faa1af246dd12a6f3e8ccc827a
+  metadata.gz: 581035f739e6ecf4fdd07d42b7ff78b1012f3ad2
+  data.tar.gz: 26c02597dab733a1fdf7d948a7a274029033ae21
 SHA512:
-  metadata.gz: eec6ef8ffffbb53e2717a82fd85de7d089b2accc799905ba8a277a4a2fe8a4ba18382eef0e5a7939deb94b4070a96f785b9513c7ffecc61499f8fb79de083dd6
-  data.tar.gz: 2fc1f05e9c47a36e5451665b76acfda798f5787fee4bd833f65d955a434ad375cb2c7517b1ee4500e87e9854ad957fa38ec56fe606b9bf9d7802140ac9fca34d
+  metadata.gz: ace3433e3bc81e986d56177f392a54f24e9a6f5cd1a050107d5273271cc61df5b022dfae32f99fb0cd74b71d5c9470daebca8073a5106bbe605f71d788196500
+  data.tar.gz: abca98c2d32c438dfc4f60e8dabcea79cc0f28c616d62942a02f768bb0353199abd139aacdc12db546ee19e66b95fb0a36644104dd47c663f034f02882bffd24

data/Changes.md

@@ -1,5 +1,11 @@
 # Sidekiq Changes
 
+4.2.4
+-----------
+
+- Log errors coming from the Rails 5 reloader. [#3212, eugeneius]
+- Clone job data so middleware changes don't appear in Busy tab
+
 4.2.3
 -----------
 

data/lib/sidekiq/processor.rb

@@ -119,9 +119,9 @@ module Sidekiq
       jobstr = work.job
       queue = work.queue_name
 
-      @reloader.call do
-        ack = false
-        begin
+      ack = false
+      begin
+        @reloader.call do
           job = Sidekiq.load_json(jobstr)
           klass  = job['class'.freeze].constantize
           worker = klass.new
@@ -137,17 +137,17 @@ module Sidekiq
             end
           end
           ack = true
-        rescue Sidekiq::Shutdown
-          # Had to force kill this job because it didn't finish
-          # within the timeout.  Don't acknowledge the work since
-          # we didn't properly finish it.
-          ack = false
-        rescue Exception => ex
-          handle_exception(ex, { :context => "Job raised exception", :job => job, :jobstr => jobstr })
-          raise
-        ensure
-          work.acknowledge if ack
         end
+      rescue Sidekiq::Shutdown
+        # Had to force kill this job because it didn't finish
+        # within the timeout.  Don't acknowledge the work since
+        # we didn't properly finish it.
+        ack = false
+      rescue Exception => ex
+        handle_exception(ex, { :context => "Job raised exception", :job => job, :jobstr => jobstr })
+        raise
+      ensure
+        work.acknowledge if ack
       end
     end
 
@@ -165,7 +165,7 @@ module Sidekiq
 
     def stats(worker, job, queue)
       tid = thread_identity
-      WORKER_STATE[tid] = {:queue => queue, :payload => job, :run_at => Time.now.to_i }
+      WORKER_STATE[tid] = {:queue => queue, :payload => cloned(job), :run_at => Time.now.to_i }
 
       begin
         yield

data/lib/sidekiq/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sidekiq
-  VERSION = "4.2.3"
+  VERSION = "4.2.4"
 end

data/test/test_processor.rb

@@ -65,6 +65,40 @@ class TestProcessor < Sidekiq::Test
       assert_equal [['myarg']], msg['args']
     end
 
+    describe 'exception handling' do
+      let(:errors) { [] }
+      let(:error_handler) { proc { |ex, _| errors << ex } }
+
+      before do
+        Sidekiq.error_handlers << error_handler
+      end
+
+      after do
+        Sidekiq.error_handlers.pop
+      end
+
+      it 'handles exceptions raised by the job' do
+        msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
+        begin
+          @processor.process(work(msg))
+        rescue TestException
+        end
+        assert_equal 1, errors.count
+        assert_instance_of TestException, errors.first
+      end
+
+      it 'handles exceptions raised by the reloader' do
+        msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
+        @processor.instance_variable_set(:'@reloader', proc { raise TEST_EXCEPTION })
+        begin
+          @processor.process(work(msg))
+        rescue TestException
+        end
+        assert_equal 1, errors.count
+        assert_instance_of TestException, errors.first
+      end
+    end
+
     describe 'acknowledgement' do
       class ExceptionRaisingMiddleware
         def initialize(raise_before_yield, raise_after_yield, skip)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis