sidekiq 4.2.6 → 4.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dca1b4492db20ca793becbe891322c358858157
-  data.tar.gz: 89782986b48def18330d996488e4b823946d5963
+  metadata.gz: 4a0c3d337d5c12118df6a841022364a29a0d0f32
+  data.tar.gz: b28df88c08bed2192a2a6a529928120887ca595a
 SHA512:
-  metadata.gz: f4ff8bfb9436c9508bfbf4d72d66156f940fa4372ae5237124442fc80ef21dd51237b44c3fc8aafab6f798f2b1576f09522ce60ade66748566df5c7c392fc7eb
-  data.tar.gz: 0e21ba4873492e74370b62b4cec47a38383115cc85f9a25b4b695ec54e392fea6f771580e315c8037eb78a0d1309651a08849aea4ea5ec378811650a55237377
+  metadata.gz: f397a4ca48db4a830b4b7c41a95b2df0b594bf41ad0777f1c79acb821649ff7c87d9790810730aa353ba40e1af5d050f229e23bac1cc2055681d51b3bf11efe6
+  data.tar.gz: 5b83dea7315ee15bc8d0020873774f6896c41f1ec821292bedaf1e4595a30a966f7ebd91504a7933e57efbf900a5e1b0bc2fb2183f49333d77990535b37119ec

data/Changes.md

@@ -1,5 +1,14 @@
 # Sidekiq Changes
 
+4.2.7
+-----------
+
+- Add new integration testing to verify code loading and job execution
+  in development and production modes with Rails 4 and 5 [#3241]
+- Fix delayed extensions in development mode [#3227, DarthSim]
+- Use Worker's `retry` default if job payload does not have a retry
+  attribute [#3234, mlarraz]
+
 4.2.6
 -----------
 

data/Ent-Changes.md

@@ -3,6 +3,12 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+HEAD
+-------------
+
+- Add new web authorization API [#3251]
+- Update all sidekiqswarm env vars to use SIDEKIQ\_ prefix [#3218]
+
 1.4.0
 -------------
 

data/Pro-Changes.md

@@ -3,6 +3,11 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+HEAD
+---------
+
+- Don't display "Delete/Retry All" buttons when filtering in Web UI, #3243
+
 3.4.0
 ---------
 

data/Rakefile

@@ -1,9 +1,12 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  #SO MUCH NOISE
-  #test.warning = true
+  test.warning = true
   test.pattern = 'test/**/test_*.rb'
 end
 
 task :default => :test
+
+task :appraise do
+  exec("cd myapp && rake appraise")
+end

data/lib/sidekiq.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 require 'sidekiq/version'
 fail "Sidekiq #{Sidekiq::VERSION} does not support Ruby versions below 2.0.0." if RUBY_PLATFORM != 'java' && RUBY_VERSION < '2.0.0'
 

data/lib/sidekiq/api.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 require 'sidekiq'
 
 module Sidekiq

data/lib/sidekiq/cli.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 $stdout.sync = true
 
 require 'yaml'
@@ -229,7 +229,7 @@ module Sidekiq
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
           ::Rails.application.eager_load!
-        elsif ::Rails::VERSION::MAJOR >= 4 && environment != 'development'
+        elsif ::Rails::VERSION::MAJOR == 4
           # Painful contortions, see 1791 for discussion
           # No autoloading, we want to force eager load for everything.
           require File.expand_path("#{options[:require]}/config/application.rb")

data/lib/sidekiq/core_ext.rb

@@ -104,3 +104,16 @@ rescue LoadError
 end
 
 
+begin
+  require 'active_support/core_ext/kernel/reporting'
+rescue LoadError
+  module Kernel
+    module_function
+    def silence_warnings
+      old_verbose, $VERBOSE = $VERBOSE, nil
+      yield
+    ensure
+      $VERBOSE = old_verbose
+    end
+  end
+end

data/lib/sidekiq/launcher.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 require 'sidekiq/manager'
 require 'sidekiq/fetch'
 require 'sidekiq/scheduled'
@@ -63,15 +63,16 @@ module Sidekiq
 
     JVM_RESERVED_SIGNALS = ['USR1', 'USR2'] # Don't Process#kill if we get these signals via the API
 
-    def heartbeat(k, data, json)
-      results = Sidekiq::CLI::PROCTITLES.map {|x| x.(self, data) }
+    def heartbeat
+      results = Sidekiq::CLI::PROCTITLES.map {|x| x.(self, to_data) }
       results.compact!
       $0 = results.join(' ')
 
-      ❤(k, json)
+      ❤
     end
 
-    def ❤(key, json)
+    def ❤
+      key = identity
       fails = procd = 0
       begin
         Processor::FAILURE.update {|curr| fails = curr; 0 }
@@ -98,7 +99,7 @@ module Sidekiq
           conn.multi do
             conn.sadd('processes', key)
             conn.exists(key)
-            conn.hmset(key, 'info', json, 'busy', Processor::WORKER_STATE.size, 'beat', Time.now.to_f, 'quiet', @done)
+            conn.hmset(key, 'info', to_json, 'busy', Processor::WORKER_STATE.size, 'beat', Time.now.to_f, 'quiet', @done)
             conn.expire(key, 60)
             conn.rpop("#{key}-signals")
           end
@@ -124,28 +125,36 @@ module Sidekiq
     end
 
     def start_heartbeat
-      k = identity
-      data = {
-        'hostname' => hostname,
-        'started_at' => Time.now.to_f,
-        'pid' => $$,
-        'tag' => @options[:tag] || '',
-        'concurrency' => @options[:concurrency],
-        'queues' => @options[:queues].uniq,
-        'labels' => @options[:labels],
-        'identity' => k,
-      }
-      # this data doesn't change so dump it to a string
-      # now so we don't need to dump it every heartbeat.
-      json = Sidekiq.dump_json(data)
-
       while true
-        heartbeat(k, data, json)
+        heartbeat
         sleep 5
       end
       Sidekiq.logger.info("Heartbeat stopping...")
     end
 
+    def to_data
+      @data ||= begin
+        {
+          'hostname' => hostname,
+          'started_at' => Time.now.to_f,
+          'pid' => $$,
+          'tag' => @options[:tag] || '',
+          'concurrency' => @options[:concurrency],
+          'queues' => @options[:queues].uniq,
+          'labels' => @options[:labels],
+          'identity' => identity,
+        }
+      end
+    end
+
+    def to_json
+      @json ||= begin
+        # this data changes infrequently so dump it to a string
+        # now so we don't need to dump it every heartbeat.
+        Sidekiq.dump_json(to_data)
+      end
+    end
+
     def clear_heartbeat
       # Remove record from Redis since we are shutting down.
       # Note we don't stop the heartbeat thread; if the process

data/lib/sidekiq/manager.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 require 'sidekiq/util'
 require 'sidekiq/processor'
 require 'sidekiq/fetch'

data/lib/sidekiq/rails.rb

@@ -71,6 +71,7 @@ module Sidekiq
         else
           Sidekiq.logger.debug { "Enabling Rails 5+ live code reloading, so hot!" }
           Sidekiq.options[:reloader] = Sidekiq::Rails::Reloader.new
+          Psych::Visitors::ToRuby.prepend(Sidekiq::Rails::PsychAutoload)
         end
       end
     end
@@ -106,5 +107,13 @@ module Sidekiq
         "#<Sidekiq::Rails::Reloader @app=#{@app.class.name}>"
       end
     end
+
+    module PsychAutoload
+      def resolve_class(klass_name)
+        klass_name && klass_name.constantize
+      rescue NameError
+        super
+      end
+    end
   end if defined?(::Rails)
 end

data/lib/sidekiq/testing.rb

@@ -69,7 +69,9 @@ module Sidekiq
     def raw_push(payloads)
       if Sidekiq::Testing.fake?
         payloads.each do |job|
-          Queues.push(job['queue'], job['class'], Sidekiq.load_json(Sidekiq.dump_json(job)))
+          job = Sidekiq.load_json(Sidekiq.dump_json(job))
+          job.merge!('enqueued_at' => Time.now.to_f) unless job['at']
+          Queues.push(job['queue'], job['class'], job)
         end
         true
       elsif Sidekiq::Testing.inline?

data/lib/sidekiq/version.rb

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

data/lib/sidekiq/web/helpers.rb

@@ -81,6 +81,11 @@ module Sidekiq
       end
     end
 
+    # mperham/sidekiq#3243
+    def unfiltered?
+      yield unless env['PATH_INFO'].start_with?("/filter/")
+    end
+
     def get_locale
       strings(locale)
     end
@@ -112,10 +117,6 @@ module Sidekiq
       end.map { |msg| Sidekiq.load_json(msg) }
     end
 
-    def location
-      Sidekiq.redis { |conn| conn.client.location }
-    end
-
     def redis_connection
       Sidekiq.redis { |conn| conn.client.id }
     end

data/test/test_api.rb

@@ -174,15 +174,15 @@ class TestApi < Sidekiq::Test
       before do
         ActiveJob::Base.queue_adapter = :sidekiq
         ActiveJob::Base.logger = nil
+      end
 
-        class ApiMailer < ActionMailer::Base
-          def test_email(*)
-          end
+      class ApiMailer < ActionMailer::Base
+        def test_email(*)
         end
+      end
 
-        class ApiJob < ActiveJob::Base
-          def perform(*)
-          end
+      class ApiJob < ActiveJob::Base
+        def perform(*)
         end
       end
 

data/test/test_extensions.rb

@@ -117,10 +117,12 @@ class TestExtensions < Sidekiq::Test
 
       Sidekiq.instance_eval { remove_instance_variable :@delay_removed }
       # Reload modified modules
-      load 'sidekiq/extensions/action_mailer.rb'
-      load 'sidekiq/extensions/active_record.rb'
-      load 'sidekiq/extensions/generic_proxy.rb'
-      load 'sidekiq/extensions/class_methods.rb'
+      silence_warnings do
+        load 'sidekiq/extensions/action_mailer.rb'
+        load 'sidekiq/extensions/active_record.rb'
+        load 'sidekiq/extensions/generic_proxy.rb'
+        load 'sidekiq/extensions/class_methods.rb'
+      end
     end
   end
 

data/test/test_launcher.rb

@@ -18,6 +18,7 @@ class TestLauncher < Sidekiq::Test
         @mgr = new_manager(options)
         @launcher = Sidekiq::Launcher.new(options)
         @launcher.manager = @mgr
+        @id = @launcher.identity
 
         Sidekiq::Processor::WORKER_STATE['a'] = {'b' => 1}
 
@@ -35,16 +36,16 @@ class TestLauncher < Sidekiq::Test
           i += 1
         end
         assert_equal 0, i
-        @launcher.heartbeat('identity', heartbeat_data, Sidekiq.dump_json(heartbeat_data))
+        @launcher.heartbeat
         assert_equal 1, i
-        @launcher.heartbeat('identity', heartbeat_data, Sidekiq.dump_json(heartbeat_data))
+        @launcher.heartbeat
         assert_equal 1, i
       end
 
       describe 'when manager is active' do
         before do
           Sidekiq::CLI::PROCTITLES << proc { "xyz" }
-          @launcher.heartbeat('identity', heartbeat_data, Sidekiq.dump_json(heartbeat_data))
+          @launcher.heartbeat
           Sidekiq::CLI::PROCTITLES.pop
         end
 
@@ -53,9 +54,9 @@ class TestLauncher < Sidekiq::Test
         end
 
         it 'stores process info in redis' do
-          info = Sidekiq.redis { |c| c.hmget('identity', 'busy') }
+          info = Sidekiq.redis { |c| c.hmget(@id, 'busy') }
           assert_equal ["1"], info
-          expires = Sidekiq.redis { |c| c.pttl('identity') }
+          expires = Sidekiq.redis { |c| c.pttl(@id) }
           assert_in_delta 60000, expires, 500
         end
       end
@@ -63,7 +64,7 @@ class TestLauncher < Sidekiq::Test
       describe 'when manager is stopped' do
         before do
           @launcher.quiet
-          @launcher.heartbeat('identity', heartbeat_data, Sidekiq.dump_json(heartbeat_data))
+          @launcher.heartbeat
         end
 
         #after do
@@ -75,21 +76,17 @@ class TestLauncher < Sidekiq::Test
         end
 
         it 'stores process info in redis' do
-          info = Sidekiq.redis { |c| c.hmget('identity', 'busy') }
+          info = Sidekiq.redis { |c| c.hmget(@id, 'busy') }
           assert_equal ["1"], info
-          expires = Sidekiq.redis { |c| c.pttl('identity') }
+          expires = Sidekiq.redis { |c| c.pttl(@id) }
           assert_in_delta 60000, expires, 50
         end
       end
     end
 
     def options
-      { :concurrency => 3, :queues => ['default'] }
+      { :concurrency => 3, :queues => ['default'], :tag => 'myapp' }
     end
 
-    def heartbeat_data
-      { 'concurrency' => 3, 'tag' => 'myapp' }
-    end
   end
-
 end

data/test/test_retry.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 require_relative 'helper'
 require 'sidekiq/scheduled'
 require 'sidekiq/middleware/server/retry_jobs'

data/test/test_sidekiq.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 require_relative 'helper'
 
 class TestSidekiq < Sidekiq::Test

data/test/test_testing_fake.rb

@@ -61,8 +61,10 @@ class TestTesting < Sidekiq::Test
     it 'stubs the async call' do
       assert_equal 0, DirectWorker.jobs.size
       assert DirectWorker.perform_async(1, 2)
+      assert_in_delta Time.now.to_f, DirectWorker.jobs.last['enqueued_at'], 0.01
       assert_equal 1, DirectWorker.jobs.size
       assert DirectWorker.perform_in(10, 1, 2)
+      refute DirectWorker.jobs.last['enqueued_at']
       assert_equal 2, DirectWorker.jobs.size
       assert DirectWorker.perform_at(10, 1, 2)
       assert_equal 3, DirectWorker.jobs.size

data/test/test_web.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
 # encoding: utf-8
+# frozen_string_literal: true
 require_relative 'helper'
 require 'sidekiq/web'
 require 'rack/test'
@@ -414,73 +414,26 @@ class TestWeb < Sidekiq::Test
         2.times { add_retry }
         3.times { add_scheduled }
         4.times { add_worker }
+      end
 
+      it 'works' do
         get '/stats'
         @response = Sidekiq.load_json(last_response.body)
-      end
-
-      it 'can refresh dashboard stats' do
         assert_equal 200, last_response.status
-      end
-
-      describe "for sidekiq" do
-        it 'are namespaced' do
-          assert_includes @response.keys, "sidekiq"
-        end
-
-        it 'reports processed' do
-          assert_equal 5, @response["sidekiq"]["processed"]
-        end
-
-        it 'reports failed' do
-          assert_equal 2, @response["sidekiq"]["failed"]
-        end
-
-        it 'reports busy' do
-          assert_equal 4, @response["sidekiq"]["busy"]
-        end
-
-        it 'reports processes' do
-          assert_equal 1, @response["sidekiq"]["processes"]
-        end
-
-        it 'reports retries' do
-          assert_equal 2, @response["sidekiq"]["retries"]
-        end
-
-        it 'reports scheduled' do
-          assert_equal 3, @response["sidekiq"]["scheduled"]
-        end
-
-        it 'reports latency' do
-          assert_equal 0, @response["sidekiq"]["default_latency"]
-        end
-      end
-
-      describe "for redis" do
-        it 'are namespaced' do
-          assert_includes @response.keys, "redis"
-        end
-
-        it 'reports version' do
-          assert_includes @response["redis"].keys, "redis_version"
-        end
-
-        it 'reports uptime' do
-          assert_includes @response["redis"].keys, "uptime_in_days"
-        end
-
-        it 'reports connected clients' do
-          assert_includes @response["redis"].keys, "connected_clients"
-        end
-
-        it 'reports user memory' do
-          assert_includes @response["redis"].keys, "used_memory_human"
-        end
-
-        it 'reports memory peak' do
-          assert_includes @response["redis"].keys, "used_memory_peak_human"
-        end
+        assert_includes @response.keys, "sidekiq"
+        assert_equal 5, @response["sidekiq"]["processed"]
+        assert_equal 2, @response["sidekiq"]["failed"]
+        assert_equal 4, @response["sidekiq"]["busy"]
+        assert_equal 1, @response["sidekiq"]["processes"]
+        assert_equal 2, @response["sidekiq"]["retries"]
+        assert_equal 3, @response["sidekiq"]["scheduled"]
+        assert_equal 0, @response["sidekiq"]["default_latency"]
+        assert_includes @response.keys, "redis"
+        assert_includes @response["redis"].keys, "redis_version"
+        assert_includes @response["redis"].keys, "uptime_in_days"
+        assert_includes @response["redis"].keys, "connected_clients"
+        assert_includes @response["redis"].keys, "used_memory_human"
+        assert_includes @response["redis"].keys, "used_memory_peak_human"
       end
     end
 

data/web/views/morgue.erb

@@ -57,14 +57,16 @@
     <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
   </form>
 
-  <form action="<%= root_path %>morgue/all/delete" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
-  <form action="<%= root_path %>morgue/all/retry" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
+  <% unfiltered? do %>
+    <form action="<%= root_path %>morgue/all/delete" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+    <form action="<%= root_path %>morgue/all/retry" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+  <% end %>
 
 <% else %>
   <div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>

data/web/views/retries.erb

@@ -60,14 +60,16 @@
     <input class="btn btn-danger btn-xs pull-left" type="submit" name="kill" value="<%= t('Kill') %>" />
   </form>
 
-  <form action="<%= root_path %>retries/all/delete" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
-  <form action="<%= root_path %>retries/all/retry" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
+  <% unfiltered? do %>
+    <form action="<%= root_path %>retries/all/delete" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+    <form action="<%= root_path %>retries/all/retry" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+  <% end %>
 
 <% else %>
   <div class="alert alert-success"><%= t('NoRetriesFound') %></div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.2.7
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby
@@ -346,4 +346,3 @@ test_files:
 - test/test_util.rb
 - test/test_web.rb
 - test/test_web_helpers.rb
-has_rdoc: