sidekiq 4.2.5 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a2578c1e0ac05d0f59c8ec89ac300e8c8dab429
-  data.tar.gz: 180b80981a6d6043b6aec7222f16d9ab2d5f93a8
+  metadata.gz: 2dca1b4492db20ca793becbe891322c358858157
+  data.tar.gz: 89782986b48def18330d996488e4b823946d5963
 SHA512:
-  metadata.gz: 60a192e270a1d867cb8c3787aebd46f6ffcb6bd5a6f63fd61519d83ef93ab46b44658d32d671139fb7a33a55dc5641b4e9793ebda1a82f69fa5105d19ac8ce3b
-  data.tar.gz: df14db1cc745182b29b7d8924a51759ff1fe01a1331959af53fde65eeab456dde03f52e85ddacc39a92ce6b27eead378a3ea30c3d5da5e8ea77b13007218f21f
+  metadata.gz: f4ff8bfb9436c9508bfbf4d72d66156f940fa4372ae5237124442fc80ef21dd51237b44c3fc8aafab6f798f2b1576f09522ce60ade66748566df5c7c392fc7eb
+  data.tar.gz: 0e21ba4873492e74370b62b4cec47a38383115cc85f9a25b4b695ec54e392fea6f771580e315c8037eb78a0d1309651a08849aea4ea5ec378811650a55237377

data/Changes.md

@@ -1,5 +1,10 @@
 # Sidekiq Changes
 
+4.2.6
+-----------
+
+- Run Rails Executor when in production [#3221, eugeneius]
+
 4.2.5
 -----------
 

data/README.md

@@ -50,7 +50,8 @@ Getting Started
 -----------------
 
 See the [Getting Started wiki page](https://github.com/mperham/sidekiq/wiki/Getting-Started) and follow the simple setup process.
-You can watch [Railscast #366](http://railscasts.com/episodes/366-sidekiq) to see Sidekiq in action.  If you do everything right, you should see this:
+You can watch [this Youtube playlist](https://www.youtube.com/playlist?list=PLjeHh2LSCFrWGT5uVjUuFKAcrcj5kSai1) to learn all about
+Sidekiq and see its features in action.  Here's the Web UI:
 
 ![Web UI](https://github.com/mperham/sidekiq/raw/master/examples/web-ui.png)
 

data/bin/sidekiqload

@@ -12,19 +12,6 @@ require_relative '../lib/sidekiq/launcher'
 
 include Sidekiq::Util
 
-# brew tap shopify/shopify
-# brew install toxiproxy
-# gem install toxiproxy
-require 'toxiproxy'
-# simulate a non-localhost network for realer-world conditions.
-# adding 1ms of network latency has an ENORMOUS impact on benchmarks
-Toxiproxy.populate([{
-    "name": "redis",
-    "listen": "127.0.0.1:6380",
-    "upstream": "127.0.0.1:6379"
-}])
-
-
 Sidekiq.configure_server do |config|
   #config.options[:concurrency] = 1
   config.redis = { driver: :hiredis, db: 13, port: 6380 }

data/lib/sidekiq.rb

@@ -33,6 +33,7 @@ module Sidekiq
     dead_max_jobs: 10_000,
     dead_timeout_in_seconds: 180 * 24 * 60 * 60, # 6 months
     reloader: proc { |&block| block.call },
+    executor: proc { |&block| block.call },
   }
 
   DEFAULT_WORKER_OPTIONS = {

data/lib/sidekiq/processor.rb

@@ -37,6 +37,7 @@ module Sidekiq
       @thread = nil
       @strategy = (mgr.options[:fetch] || Sidekiq::BasicFetch).new(mgr.options)
       @reloader = Sidekiq.options[:reloader]
+      @executor = Sidekiq.options[:executor]
     end
 
     def terminate(wait=false)
@@ -121,19 +122,21 @@ module Sidekiq
 
       ack = false
       begin
+        job_hash = Sidekiq.load_json(jobstr)
         @reloader.call do
-          job = Sidekiq.load_json(jobstr)
-          klass  = job['class'.freeze].constantize
+          klass  = job_hash['class'.freeze].constantize
           worker = klass.new
-          worker.jid = job['jid'.freeze]
-
-          stats(worker, job, queue) do
-            Sidekiq.server_middleware.invoke(worker, job, queue) do
-              # Only ack if we either attempted to start this job or
-              # successfully completed it. This prevents us from
-              # losing jobs if a middleware raises an exception before yielding
-              ack = true
-              execute_job(worker, cloned(job['args'.freeze]))
+          worker.jid = job_hash['jid'.freeze]
+
+          stats(worker, job_hash, queue) do
+            Sidekiq.server_middleware.invoke(worker, job_hash, queue) do
+              @executor.call do
+                # Only ack if we either attempted to start this job or
+                # successfully completed it. This prevents us from
+                # losing jobs if a middleware raises an exception before yielding
+                ack = true
+                execute_job(worker, cloned(job_hash['args'.freeze]))
+              end
             end
           end
           ack = true
@@ -144,7 +147,7 @@ module Sidekiq
         # we didn't properly finish it.
         ack = false
       rescue Exception => ex
-        handle_exception(ex, { :context => "Job raised exception", :job => job, :jobstr => jobstr })
+        handle_exception(ex, { :context => "Job raised exception", :job => job_hash, :jobstr => jobstr })
         raise
       ensure
         work.acknowledge if ack
@@ -163,9 +166,9 @@ module Sidekiq
     PROCESSED = Concurrent::AtomicFixnum.new
     FAILURE = Concurrent::AtomicFixnum.new
 
-    def stats(worker, job, queue)
+    def stats(worker, job_hash, queue)
       tid = thread_identity
-      WORKER_STATE[tid] = {:queue => queue, :payload => cloned(job), :run_at => Time.now.to_i }
+      WORKER_STATE[tid] = {:queue => queue, :payload => cloned(job_hash), :run_at => Time.now.to_i }
 
       begin
         yield

data/lib/sidekiq/rails.rb

@@ -67,15 +67,32 @@ module Sidekiq
           # The reloader API has proven to be troublesome under load in production.
           # We won't use it at all when classes are cached, see #3154
           Sidekiq.logger.debug { "Autoload disabled in #{::Rails.env}, Sidekiq will not reload changed classes" }
+          Sidekiq.options[:executor] = Sidekiq::Rails::Executor.new
         else
+          Sidekiq.logger.debug { "Enabling Rails 5+ live code reloading, so hot!" }
           Sidekiq.options[:reloader] = Sidekiq::Rails::Reloader.new
         end
       end
     end
 
+    class Executor
+      def initialize(app = ::Rails.application)
+        @app = app
+      end
+
+      def call
+        @app.executor.wrap do
+          yield
+        end
+      end
+
+      def inspect
+        "#<Sidekiq::Rails::Executor @app=#{@app.class.name}>"
+      end
+    end
+
     class Reloader
       def initialize(app = ::Rails.application)
-        Sidekiq.logger.debug "Enabling Rails 5+ live code reloading, so hot!" unless app.config.cache_classes
         @app = app
       end
 

data/lib/sidekiq/version.rb

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

data/lib/sidekiq/web/helpers.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'uri'
+require 'set'
 require 'yaml'
 
 module Sidekiq

data/test/test_processor.rb

@@ -67,7 +67,11 @@ class TestProcessor < Sidekiq::Test
 
     describe 'exception handling' do
       let(:errors) { [] }
-      let(:error_handler) { proc { |ex, _| errors << ex } }
+      let(:error_handler) do
+        proc do |exception, context|
+          errors << { exception: exception, context: context }
+        end
+      end
 
       before do
         Sidekiq.error_handlers << error_handler
@@ -78,24 +82,34 @@ class TestProcessor < Sidekiq::Test
       end
 
       it 'handles exceptions raised by the job' do
-        msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
+        job_hash = { 'class' => MockWorker.to_s, 'args' => ['boom'] }
+        msg = Sidekiq.dump_json(job_hash)
+        job = work(msg)
         begin
-          @processor.process(work(msg))
+          @processor.instance_variable_set(:'@job', job)
+          @processor.process(job)
         rescue TestException
         end
         assert_equal 1, errors.count
-        assert_instance_of TestException, errors.first
+        assert_instance_of TestException, errors.first[:exception]
+        assert_equal msg, errors.first[:context][:jobstr]
+        assert_equal job_hash, errors.first[:context][:job]
       end
 
       it 'handles exceptions raised by the reloader' do
-        msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
+        job_hash = { 'class' => MockWorker.to_s, 'args' => ['boom'] }
+        msg = Sidekiq.dump_json(job_hash)
         @processor.instance_variable_set(:'@reloader', proc { raise TEST_EXCEPTION })
+        job = work(msg)
         begin
-          @processor.process(work(msg))
+          @processor.instance_variable_set(:'@job', job)
+          @processor.process(job)
         rescue TestException
         end
         assert_equal 1, errors.count
-        assert_instance_of TestException, errors.first
+        assert_instance_of TestException, errors.first[:exception]
+        assert_equal msg, errors.first[:context][:jobstr]
+        assert_equal job_hash, errors.first[:context][:job]
       end
     end
 

metadata

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