sidekiq 2.16.1 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e9d5b007bd144d33930ee67fa26a492e6664eb
-  data.tar.gz: 28e8782a74a452e75040674eaf22ac33cf2bb660
+  metadata.gz: c3c94aa8a163d8572aaa7c04bc1fbdf0b2bb737c
+  data.tar.gz: d7cd0118de313f863b5c6ead2163a47e0cb8cdc9
 SHA512:
-  metadata.gz: a0c318ac705b8ca596327765b1ea1ed914534b70736dc3af10c8adac268d53f576e30df7b4a56568fd8b5f97e1f4e739609af50fc03ccf83d730f1a8c9bfcfd7
-  data.tar.gz: bc670c8eb9e5d31fe24d4d7a7ef7301e8390d606c178c6b68b9638b8588f298c63c97d500280ddf802f69b602a589ca2d913f7336338ac00a2582fecec4ae58b
+  metadata.gz: ce15a352e04acb9be28519faf11a2bbac4cc3deec7467abef232a53679cde91d4a60a5f08bf0143cd3ebde20559e8ee112e2ef270332e27fc8a95814eb7df9cd
+  data.tar.gz: 2ea6a283ea6850816178520608dd37fec6e46ebe72ce933daa02204862f1815d588a02b790b33009c39fe56ff55f90b108f9c445e36875ed8d5f4596c53c4c3a

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
+services:
+  - redis-server
 rvm:
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2.1.1
   - 2.0.0
 branches:
   only:
@@ -15,5 +17,4 @@ notifications:
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: rbx-19mode
-    - rvm: 2.0.0
+    - rvm: rbx-2.1.1

data/Changes.md

@@ -1,3 +1,13 @@
+2.17.0
+-----------
+
+- Change USR1 signal handling to exit process as soon as all workers are quiet. [#1358]
+- Change `Sidekiq::Client#push_bulk` to return an array of pushed `jid`s. [#1315, barelyknown]
+- Web UI refactoring to use more API internally (yummy dogfood!)
+- Much faster Sidekiq::Job#delete performance for larger queue sizes
+- Further capistrano 3 fixes
+- Many misc minor fixes
+
 2.16.1
 -----------
 

data/Pro-Changes.md

@@ -1,13 +1,56 @@
 Sidekiq Pro Changelog
 =======================
 
-Please see http://sidekiq.org/pro for more details and how to buy.
+Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
+
+HEAD
+-----------
+
+Thanks to @jonhyman for his contributions to this Sidekiq Pro release.
+
+This release includes new functionality based on the SCAN command newly
+added to Redis 2.8.  Pro still works with Redis 2.4 but some
+functionality will be unavailable.
+
+- Job Filtering in the Web UI!
+  You can now filter retries and scheduled jobs in the Web UI so you
+  only see the jobs relevant to your needs.  Queues cannot be filtered;
+  Redis does not provide the same SCAN operation on the LIST type.
+  **Redis 2.8 only**
+- SCAN support in the Sidekiq::SortedSet API.  Here's an example that
+  finds all jobs which contain the substring "Warehouse::OrderShip"
+  and deletes all matching retries.  If the set is large, this API
+  will be **MUCH** faster than standard iteration using each.
+  **Redis 2.8 only**
+```ruby
+  Sidekiq::RetrySet.new.scan("Warehouse::OrderShip") do |job|
+    job.delete
+  end
+```
+
+- Sidekiq::Batch#jobs now returns the set of JIDs added to the batch.
+- Sidekiq::Batch#jids returns the complete set of JIDs associated with the batch.
+- Sidekiq::Batch#remove\_jobs(jid, jid, ...) removes JIDs from the set, allowing early termination of jobs if they become irrelevant according to application logic.
+- Sidekiq::Batch#include?(jid) allows jobs to check if they are still
+  relevant to a Batch and exit early if not.
+- Sidekiq::SortedSet#find\_job(jid) now uses server-side Lua **Redis 2.6 only** [jonhyman]
+- The statsd integration now sets global job counts:
+```ruby
+  jobs.count
+  jobs.success
+  jobs.failure
+```
+
+- Change shutdown logic to push leftover jobs in the private queue back
+  into the public queue when shutting down with Reliable Fetch.  This
+  allows the safe decommission of a Sidekiq Pro process when autoscaling. [jonhyman]
+- Pro now requires Sidekiq 2.17.0
 
 1.2.5
 -----------
 
-- Convert Batch UI to use Sidekiq 2.16's support for extension
-  localization.
+- Convert Batch UI to use Sidekiq 2.16's support for extension localization.
+- Update reliable\_push to work with Sidekiq::Client refactoring in 2.16
 - Pro now requires Sidekiq 2.16.0
 
 1.2.4

data/lib/sidekiq/api.rb

@@ -195,7 +195,7 @@ module Sidekiq
     # Remove this job from the queue.
     def delete
       count = Sidekiq.redis do |conn|
-        conn.lrem("queue:#{@queue}", 0, @value)
+        conn.lrem("queue:#{@queue}", 1, @value)
       end
       count != 0
     end

data/lib/sidekiq/cli.rb

@@ -326,8 +326,9 @@ module Sidekiq
       end
       ns = opts.delete(:namespace)
       if ns
-        Sidekiq.logger.warn("namespace should be set in your ruby initializer, is ignored in config file")
-        Sidekiq.logger.warn("config.redis = { :url => ..., :namespace => '#{ns}' }")
+        # logger hasn't been initialized yet, puts is all we have.
+        puts("namespace should be set in your ruby initializer, is ignored in config file")
+        puts("config.redis = { :url => ..., :namespace => '#{ns}' }")
       end
       opts
     end

data/lib/sidekiq/client.rb

@@ -53,7 +53,8 @@ module Sidekiq
 
     ##
     # Push a large number of jobs to Redis.  In practice this method is only
-    # useful if you are pushing tens of thousands of jobs or more.  This method
+    # useful if you are pushing tens of thousands of jobs or more, or if you need
+    # to ensure that a batch doesn't complete prematurely.  This method
     # basically cuts down on the redis round trip latency.
     #
     # Takes the same arguments as #push except that args is expected to be
@@ -61,7 +62,7 @@ module Sidekiq
     # is run through the client middleware pipeline and each job gets its own Job ID
     # as normal.
     #
-    # Returns the number of jobs pushed or nil if the pushed failed.  The number of jobs
+    # Returns an array of the of pushed jobs' jids or nil if the pushed failed.  The number of jobs
     # pushed can be less than the number given if the middleware stopped processing for one
     # or more jobs.
     def push_bulk(items)
@@ -73,7 +74,7 @@ module Sidekiq
 
       pushed = false
       pushed = raw_push(payloads) if !payloads.empty?
-      pushed ? payloads.size : nil
+      pushed ? payloads.collect { |payload| payload['jid'] } : nil
     end
 
     class << self
@@ -186,6 +187,7 @@ module Sidekiq
         normalized_item = Sidekiq.default_worker_options.merge(item)
       end
 
+      normalized_item['queue'] = normalized_item['queue'].to_s
       normalized_item['jid'] ||= SecureRandom.hex(12)
       normalized_item['enqueued_at'] ||= Time.now.to_f
       normalized_item

data/lib/sidekiq/fetch.rb

@@ -41,13 +41,13 @@ module Sidekiq
             after(0) { fetch }
           end
         rescue => ex
-          handle_exception(ex)
+          handle_fetch_exception(ex)
         end
 
       end
     end
 
-    def handle_exception(ex)
+    def handle_fetch_exception(ex)
       if !@down
         logger.error("Error fetching message: #{ex}")
         ex.backtrace.each do |bt|
@@ -90,7 +90,9 @@ module Sidekiq
       UnitOfWork.new(*work) if work
     end
 
-    def self.bulk_requeue(inprogress)
+    # By leaving this as a class method, it can be pluggable and used by the Manager actor. Making it
+    # an instance method will make it async to the Fetcher actor
+    def self.bulk_requeue(inprogress, options)
       Sidekiq.logger.debug { "Re-queueing terminated jobs" }
       jobs_to_requeue = {}
       inprogress.each do |unit_of_work|

data/lib/sidekiq/manager.rb

@@ -19,8 +19,11 @@ module Sidekiq
     attr_reader :busy
     attr_accessor :fetcher
 
+    SPIN_TIME_FOR_GRACEFUL_SHUTDOWN = 1
+
     def initialize(options={})
       logger.debug { options.inspect }
+      @options = options
       @count = options[:concurrency] || 25
       @done_callback = nil
 
@@ -37,7 +40,7 @@ module Sidekiq
 
     def stop(options={})
       watchdog('Manager#stop died') do
-        shutdown = options[:shutdown]
+        should_shutdown = options[:shutdown]
         timeout = options[:timeout]
 
         @done = true
@@ -47,10 +50,20 @@ module Sidekiq
         @ready.clear
 
         clear_worker_set
+        return if clean_up_for_graceful_shutdown
+
+        hard_shutdown_in timeout if should_shutdown
+      end
+    end
 
-        return after(0) { signal(:shutdown) } if @busy.empty?
-        hard_shutdown_in timeout if shutdown
+    def clean_up_for_graceful_shutdown
+      if @busy.empty?
+        shutdown
+        return true
       end
+
+      after(SPIN_TIME_FOR_GRACEFUL_SHUTDOWN) { clean_up_for_graceful_shutdown }
+      false
     end
 
     def start
@@ -69,7 +82,7 @@ module Sidekiq
         @busy.delete(processor)
         if stopped?
           processor.terminate if processor.alive?
-          signal(:shutdown) if @busy.empty?
+          shutdown if @busy.empty?
         else
           @ready << processor if processor.alive?
         end
@@ -89,7 +102,7 @@ module Sidekiq
           @ready << p
           dispatch
         else
-          signal(:shutdown) if @busy.empty?
+          shutdown if @busy.empty?
         end
       end
     end
@@ -151,22 +164,16 @@ module Sidekiq
           # They must die but their messages shall live on.
           logger.info("Still waiting for #{@busy.size} busy workers")
 
-          # Re-enqueue terminated jobs
-          # NOTE: You may notice that we may push a job back to redis before
-          # the worker thread is terminated. This is ok because Sidekiq's
-          # contract says that jobs are run AT LEAST once. Process termination
-          # is delayed until we're certain the jobs are back in Redis because
-          # it is worse to lose a job than to run it twice.
-          Sidekiq::Fetcher.strategy.bulk_requeue(@in_progress.values)
+          requeue
 
-          logger.debug { "Terminating #{@busy.size} busy worker threads" }
+          logger.warn { "Terminating #{@busy.size} busy worker threads" }
           @busy.each do |processor|
             if processor.alive? && t = @threads.delete(processor.object_id)
               t.raise Shutdown
             end
           end
 
-          after(0) { signal(:shutdown) }
+          signal_shutdown
         end
       end
     end
@@ -184,5 +191,25 @@ module Sidekiq
     def stopped?
       @done
     end
+
+    def shutdown
+      requeue
+      signal_shutdown
+    end
+
+    def signal_shutdown
+      after(0) { signal(:shutdown) }
+    end
+
+    def requeue
+      # Re-enqueue terminated jobs
+      # NOTE: You may notice that we may push a job back to redis before
+      # the worker thread is terminated. This is ok because Sidekiq's
+      # contract says that jobs are run AT LEAST once. Process termination
+      # is delayed until we're certain the jobs are back in Redis because
+      # it is worse to lose a job than to run it twice.
+      Sidekiq::Fetcher.strategy.bulk_requeue(@in_progress.values, @options)
+      @in_progress.clear
+    end
   end
 end

data/lib/sidekiq/middleware/chain.rb

@@ -49,13 +49,16 @@ module Sidekiq
   #   end
   # end
   #
-  # This is an example of a minimal client middleware:
+  # This is an example of a minimal client middleware, note
+  # the method must return the result or the job will not push
+  # to Redis:
   #
   # class MyClientHook
   #   def call(worker_class, msg, queue)
   #     puts "Before push"
-  #     yield
+  #     result = yield
   #     puts "After push"
+  #     result
   #   end
   # end
   #

data/lib/sidekiq/processor.rb

@@ -37,6 +37,7 @@ module Sidekiq
       do_defer do
         @boss.async.real_thread(proxy_id, Thread.current)
 
+        ack = true
         begin
           msg = Sidekiq.load_json(msgstr)
           klass  = msg['class'].constantize
@@ -50,12 +51,14 @@ module Sidekiq
           end
         rescue Sidekiq::Shutdown
           # Had to force kill this job because it didn't finish
-          # within the timeout.
+          # within the timeout.  Don't acknowledge the work since
+          # we didn't properly finish it.
+          ack = false
         rescue Exception => ex
           handle_exception(ex, msg || { :message => msgstr })
           raise
         ensure
-          work.acknowledge
+          work.acknowledge if ack
         end
       end
 

data/lib/sidekiq/redis_connection.rb

@@ -1,5 +1,6 @@
 require 'connection_pool'
 require 'redis'
+require 'uri'
 
 module Sidekiq
   class RedisConnection
@@ -10,7 +11,7 @@ module Sidekiq
         if url
           options[:url] = url
         end
-        
+
         # need a connection for Fetcher and Retry
         size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 2) : 5)
         pool_timeout = options[:pool_timeout] || 1
@@ -53,18 +54,23 @@ module Sidekiq
       end
 
       def log_info(options)
+        # Don't log Redis AUTH password
+        scrubbed_options = options.dup
+        if scrubbed_options[:url] && (uri = URI.parse(scrubbed_options[:url])) && uri.password
+          uri.password = "REDACTED"
+          scrubbed_options[:url] = uri.to_s
+        end
         if Sidekiq.server?
-          Sidekiq.logger.info("Booting Sidekiq #{Sidekiq::VERSION} with redis options #{options}")
+          Sidekiq.logger.info("Booting Sidekiq #{Sidekiq::VERSION} with redis options #{scrubbed_options}")
         else
-          Sidekiq.logger.info("#{Sidekiq::NAME} client with redis options #{options}")
+          Sidekiq.logger.info("#{Sidekiq::NAME} client with redis options #{scrubbed_options}")
         end
       end
 
       def determine_redis_provider
         # REDISTOGO_URL is only support for legacy reasons
-        return ENV['REDISTOGO_URL'] if ENV['REDISTOGO_URL']
         provider = ENV['REDIS_PROVIDER'] || 'REDIS_URL'
-        ENV[provider]
+        ENV[provider] || ENV['REDISTOGO_URL']
       end
 
     end

data/lib/sidekiq/tasks/sidekiq.rake

@@ -23,6 +23,12 @@ namespace :load do
   end
 end
 
+namespace :deploy do
+  before :starting, :check_sidekiq_hooks do
+    invoke 'sidekiq:add_default_hooks' if fetch(:sidekiq_default_hooks)
+  end
+end
+
 namespace :sidekiq do
   def for_each_process(&block)
     fetch(:sidekiq_processes).times do |idx|
@@ -30,6 +36,13 @@ namespace :sidekiq do
     end
   end
 
+  task :add_default_hooks do
+    after 'deploy:starting',  'sidekiq:quiet'
+    after 'deploy:updated',   'sidekiq:stop'
+    after 'deploy:reverted',  'sidekiq:stop'
+    after 'deploy:published', 'sidekiq:start'
+  end
+
   desc "Quiet sidekiq (stop accepting new work)"
   task :quiet do
     on roles fetch(:sidekiq_role) do
@@ -86,11 +99,4 @@ namespace :sidekiq do
     invoke 'sidekiq:start'
   end
 
-  if fetch(:sidekiq_default_hooks)
-    after 'deploy:starting',  'sidekiq:quiet'
-    after 'deploy:updated',   'sidekiq:stop'
-    after 'deploy:reverted',  'sidekiq:stop'
-    after 'deploy:published', 'sidekiq:start'
-  end
-
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.16.1"
+  VERSION = "2.17.0"
 end

data/lib/sidekiq/web.rb

@@ -73,7 +73,7 @@ module Sidekiq
     get '/retries' do
       @count = (params[:count] || 25).to_i
       (@current_page, @total_size, @retries) = page("retry", params[:page], @count)
-      @retries = @retries.map {|msg, score| [Sidekiq.load_json(msg), score] }
+      @retries = @retries.map {|msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
       erb :retries
     end
 
@@ -125,7 +125,7 @@ module Sidekiq
     get '/scheduled' do
       @count = (params[:count] || 25).to_i
       (@current_page, @total_size, @scheduled) = page("schedule", params[:page], @count)
-      @scheduled = @scheduled.map {|msg, score| [Sidekiq.load_json(msg), score] }
+      @scheduled = @scheduled.map {|msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
       erb :scheduled
     end
 

data/lib/sidekiq/web_helpers.rb

@@ -16,6 +16,10 @@ module Sidekiq
       end
     end
 
+    # This is a hook for a Sidekiq Pro feature.  Please don't touch.
+    def filtering(*)
+    end
+
     def locale
       lang = (request.env["HTTP_ACCEPT_LANGUAGE"] || 'en')[0,2]
       strings[lang] ? lang : 'en'
@@ -159,7 +163,11 @@ module Sidekiq
     end
 
     def h(text)
-      Rack::Utils.escape_html(text)
+      ::Rack::Utils.escape_html(text)
+    rescue ArgumentError => e
+      raise unless e.message.eql?('invalid byte sequence in UTF-8')
+      text.encode!('UTF-16', 'UTF-8', invalid: :replace, replace: '').encode!('UTF-8', 'UTF-16')
+      retry
     end
 
     # Any paginated list that performs an action needs to redirect

data/test/config.yml

@@ -3,7 +3,6 @@
 :require:      ./test/fake_env.rb
 :pidfile:      /tmp/sidekiq-config-test.pid
 :logfile:      /tmp/sidekiq.log
-:namespace:    sidekiq
 :concurrency:  50
 :queues:
   - [<%="very_"%>often, 2]

data/test/test_client.rb

@@ -168,12 +168,17 @@ class TestClient < Sidekiq::Test
       Sidekiq::Queue.new.clear
     end
     it 'can push a large set of jobs at once' do
-      count = Sidekiq::Client.push_bulk('class' => QueuedWorker, 'args' => (1..1_000).to_a.map { |x| Array(x) })
-      assert_equal 1_000, count
+      jids = Sidekiq::Client.push_bulk('class' => QueuedWorker, 'args' => (1..1_000).to_a.map { |x| Array(x) })
+      assert_equal 1_000, jids.size
     end
     it 'can push a large set of jobs at once using a String class' do
-      count = Sidekiq::Client.push_bulk('class' => 'QueuedWorker', 'args' => (1..1_000).to_a.map { |x| Array(x) })
-      assert_equal 1_000, count
+      jids = Sidekiq::Client.push_bulk('class' => 'QueuedWorker', 'args' => (1..1_000).to_a.map { |x| Array(x) })
+      assert_equal 1_000, jids.size
+    end
+    it 'returns the jids for the jobs' do
+      Sidekiq::Client.push_bulk('class' => 'QueuedWorker', 'args' => (1..2).to_a.map { |x| Array(x) }).each do |jid|
+        assert_match /[0-9a-f]{12}/, jid
+      end
     end
   end
 
@@ -203,7 +208,9 @@ class TestClient < Sidekiq::Test
       begin
         assert_equal nil, Sidekiq::Client.push('class' => MyWorker, 'args' => [0])
         assert_match /[0-9a-f]{12}/, Sidekiq::Client.push('class' => MyWorker, 'args' => [1])
-        assert_equal 1, Sidekiq::Client.push_bulk('class' => MyWorker, 'args' => [[0], [1]])
+        Sidekiq::Client.push_bulk('class' => MyWorker, 'args' => [[0], [1]]).each do |jid|
+          assert_match /[0-9a-f]{12}/, jid
+        end
       ensure
         Sidekiq.client_middleware.remove Stopper
       end

data/test/test_fetch.rb

@@ -36,7 +36,7 @@ class TestFetcher < Sidekiq::Test
       assert_equal 0, q1.size
       assert_equal 0, q2.size
       uow = Sidekiq::BasicFetch::UnitOfWork
-      Sidekiq::BasicFetch.bulk_requeue([uow.new('fuzzy:queue:foo', 'bob'), uow.new('fuzzy:queue:foo', 'bar'), uow.new('fuzzy:queue:bar', 'widget')])
+      Sidekiq::BasicFetch.bulk_requeue([uow.new('fuzzy:queue:foo', 'bob'), uow.new('fuzzy:queue:foo', 'bar'), uow.new('fuzzy:queue:bar', 'widget')], {:queues => []})
       assert_equal 2, q1.size
       assert_equal 1, q2.size
     end

data/test/test_manager.rb

@@ -29,6 +29,7 @@ class TestManager < Sidekiq::Test
       uow.expect(:requeue, nil, [])
 
       mgr = Sidekiq::Manager.new(options)
+      mgr.fetcher = Sidekiq::BasicFetch.new({:queues => []})
       mgr.stop
       mgr.assign(uow)
       uow.verify
@@ -36,6 +37,7 @@ class TestManager < Sidekiq::Test
 
     it 'shuts down the system' do
       mgr = Sidekiq::Manager.new(options)
+      mgr.fetcher = Sidekiq::BasicFetch.new({:queues => []})
       mgr.stop
 
       assert mgr.busy.empty?

data/test/test_middleware.rb

@@ -82,7 +82,7 @@ class TestMiddleware < Sidekiq::Test
       processor = Sidekiq::Processor.new(boss)
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       boss.expect(:async, actor, [])
       boss.expect(:async, actor, [])
       processor.process(Sidekiq::BasicFetch::UnitOfWork.new('queue:default', msg))

data/test/test_processor.rb

@@ -31,7 +31,7 @@ class TestProcessor < Sidekiq::Test
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [@processor])
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
       @boss.expect(:async, actor, [])
       @processor.process(work(msg))
@@ -41,7 +41,7 @@ class TestProcessor < Sidekiq::Test
 
     it 'passes exceptions to ExceptionHandler' do
       actor = Minitest::Mock.new
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
       begin
@@ -57,7 +57,7 @@ class TestProcessor < Sidekiq::Test
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
       re_raise = false
       actor = Minitest::Mock.new
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
 
       begin
@@ -75,7 +75,7 @@ class TestProcessor < Sidekiq::Test
       processor = ::Sidekiq::Processor.new(@boss)
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
       @boss.expect(:async, actor, [])
       processor.process(work(msgstr))
@@ -103,7 +103,7 @@ class TestProcessor < Sidekiq::Test
         def successful_job
           msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
           actor = Minitest::Mock.new
-          actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+          actor.expect(:real_thread, nil, [nil, Thread])
           actor.expect(:processor_done, nil, [@processor])
           @boss.expect(:async, actor, [])
           @boss.expect(:async, actor, [])
@@ -131,7 +131,7 @@ class TestProcessor < Sidekiq::Test
 
         def failed_job
           actor = Minitest::Mock.new
-          actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+          actor.expect(:real_thread, nil, [nil, Thread])
           @boss.expect(:async, actor, [])
           msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
           begin

data/test/test_redis_connection.rb

@@ -87,6 +87,20 @@ class TestRedisConnection < Sidekiq::Test
       end
     end
 
+    describe "with REDISTOGO_URL and a parallel REDIS_PROVIDER set" do
+      it "sets connection URI to the provider" do
+        uri = 'redis://sidekiq-redis-provider:6379/0'
+        provider = 'SIDEKIQ_REDIS_PROVIDER'
+
+        ENV['REDIS_PROVIDER'] = provider
+        ENV[provider] = uri
+        ENV['REDISTOGO_URL'] = 'redis://redis-to-go:6379/0'
+        with_env_var provider, uri, true
+
+        ENV[provider] = nil
+      end
+    end
+
     describe "with REDIS_PROVIDER set" do
       it "sets connection URI to the provider" do
         uri = 'redis://sidekiq-redis-provider:6379/0'

data/test/test_scheduling.rb

@@ -31,7 +31,7 @@ class TestScheduling < Sidekiq::Test
     end
 
     it 'schedules job right away on negative timestamp/interval' do
-      @redis.expect :sadd,  true, ['queues', :custom_queue]
+      @redis.expect :sadd,  true, ['queues', 'custom_queue']
       @redis.expect :lpush, true, ['queue:custom_queue', Array]
       assert ScheduledWorker.perform_in(-300, 'mike')
       @redis.verify

data/web/assets/stylesheets/application.css

@@ -188,6 +188,17 @@ td form {
   margin-bottom: 0;
 }
 
+td.table-checkbox {
+  padding: 0px;
+}
+
+td.table-checkbox label {
+  height: 100%;
+  width: 100%;
+  padding: 8px;
+  margin-bottom: 0;
+}
+
 .navbar .navbar-brand {
   color: #b1003e;
   padding: 13px;

data/web/views/retries.erb

@@ -2,11 +2,12 @@
   <div class="col-sm-5">
     <h3><%= t('Retries') %></h3>
   </div>
-  <div class="col-sm-4">
-    <% if @retries.size > 0 %>
+  <% if @retries.size > 0 && @total_size > @count %>
+    <div class="col-sm-4">
       <%= erb :_paging, :locals => { :url => "#{root_path}retries" } %>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
+  <%= filtering('retries') %>
 </header>
 
 <% if @retries.size > 0 %>
@@ -25,24 +26,26 @@
           <th><%= t('Error') %></th>
         </tr>
       </thead>
-      <% @retries.each do |msg, score| %>
+      <% @retries.each do |entry| %>
         <tr>
-          <td>
-            <input type='checkbox' name='key[]' value='<%= job_params(msg, score) %>' />
+          <td class="table-checkbox">
+            <label>
+              <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+            </label>
           </td>
           <td>
-            <a href="<%= root_path %>retries/<%= job_params(msg, score) %>"><%= relative_time(Time.at(score)) %></a>
+            <a href="<%= root_path %>retries/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
           </td>
-          <td><%= msg['retry_count'] %></td>
+          <td><%= entry['retry_count'] %></td>
           <td>
-            <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
+            <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= msg['class'] %></td>
+          <td><%= entry.klass %></td>
           <td>
-            <div class="args"><%= display_args(msg['args']) %></div>
+            <div class="args"><%= display_args(entry.args) %></div>
           </td>
           <td>
-            <div><%= h truncate("#{msg['error_class']}: #{msg['error_message']}", 200) %></div>
+            <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
           </td>
         </tr>
       <% end %>

data/web/views/scheduled.erb

@@ -2,11 +2,12 @@
   <div class="col-sm-5">
     <h3><%= t('ScheduledJobs') %></h3>
   </div>
-  <div class="col-sm-4">
-    <% if @scheduled.size > 0 %>
+  <% if @scheduled.size > 0 && @total_size > @count %>
+    <div class="col-sm-4">
       <%= erb :_paging, :locals => { :url => "#{root_path}scheduled" } %>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
+  <%= filtering('scheduled') %>
 </header>
 
 <% if @scheduled.size > 0 %>
@@ -24,20 +25,20 @@
           <th><%= t('Arguments') %></th>
         </tr>
       </thead>
-      <% @scheduled.each do |msg, score| %>
+      <% @scheduled.each do |entry| %>
         <tr>
           <td>
-            <input type='checkbox' name='key[]' value='<%= job_params(msg, score) %>' />
+            <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
           </td>
           <td>
-             <a href="<%= root_path %>scheduled/<%= job_params(msg, score) %>"><%= relative_time(Time.at(score)) %></a>
+             <a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
           </td>
           <td>
-            <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
+            <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= msg['class'] %></td>
+          <td><%= entry.klass %></td>
           <td>
-             <div class="args"><%= display_args(msg['args']) %></div>
+             <div class="args"><%= display_args(entry.args) %></div>
           </td>
         </tr>
       <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.17.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -352,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby