sidekiq 2.12.1 → 2.12.3

data/Changes.md

@@ -1,3 +1,19 @@
+2.12.3
+-----------
+
+- Revert back to Celluloid's TaskFiber for job processing which has proven to be more
+  stable than TaskThread. [#985]
+- Avoid possible lockup during hard shutdown [#997]
+
+At this point, if you are experiencing stability issues with Sidekiq in
+Ruby 1.9, please try Ruby 2.0.  It seems to be more stable.
+
+2.12.2
+-----------
+
+- Relax slim version requirement to >= 1.1.0
+- Refactor historical stats to use TTL, not explicit cleanup. [grosser, #971]
+
 2.12.1
 -----------
 

data/Gemfile

@@ -1,7 +1,8 @@
 source 'http://rubygems.org'
 gemspec
 
-gem 'slim'
+gem 'slim', '1.1.0' # earliest verson supported
+
 gem 'sqlite3', :platform => :mri
 
 group :test do

data/lib/sidekiq/actor.rb

@@ -1,67 +1,7 @@
 module Sidekiq
-  #
-  # Celluloid has the nasty side effect of making objects
-  # very hard to test because they are immediately async
-  # upon creation.  In testing we want to just treat
-  # the actors as POROs.
-  #
-  # Instead of including Celluloid, we'll just stub
-  # out the key methods we use so that everything works
-  # synchronously.  The alternative is no test coverage.
-  #
   module Actor
-    if $TESTING
-
-      TaskThread = 0
-
-      def sleep(amount=0)
-      end
-
-      def after(amount=0)
-      end
-
-      def defer
-        yield
-      end
-
-      def current_actor
-        self
-      end
-
-      def alive?
-        !@dead
-      end
-
-      def terminate
-        @dead = true
-      end
-
-      def async
-        self
-      end
-
-      def signal(sym)
-      end
-
-      # we don't want to hide or catch failures in testing
-      def watchdog(msg)
-        yield
-      end
-
-      def self.included(klass)
-        class << klass
-          alias_method :new_link, :new
-          def trap_exit(meth)
-          end
-          def task_class(konstant)
-          end
-        end
-      end
-
-    else
-      def self.included(klass)
-        klass.send(:include, Celluloid)
-      end
+    def self.included(klass)
+      klass.send(:include, Celluloid)
     end
   end
 end

data/lib/sidekiq/api.rb

@@ -3,17 +3,11 @@ require 'sidekiq'
 module Sidekiq
   class Stats
     def processed
-      count = Sidekiq.redis do |conn|
-                conn.get("stat:processed")
-              end
-      count.nil? ? 0 : count.to_i
+      Sidekiq.redis { |conn| conn.get("stat:processed") }.to_i
     end
 
     def failed
-      count = Sidekiq.redis do |conn|
-                conn.get("stat:failed")
-              end
-      count.nil? ? 0 : count.to_i
+      Sidekiq.redis { |conn| conn.get("stat:failed") }.to_i
     end
 
     def reset
@@ -62,24 +56,6 @@ module Sidekiq
         date_stat_hash("failed")
       end
 
-      def self.cleanup
-        days_of_stats_to_keep = 180
-        today = Time.now.utc.to_date
-        delete_before_date = Time.now.utc.to_date - days_of_stats_to_keep
-
-        Sidekiq.redis do |conn|
-          processed_keys = conn.keys("stat:processed:*")
-          earliest = "stat:processed:#{delete_before_date.to_s}"
-          pkeys = processed_keys.select { |key| key < earliest }
-          conn.del(pkeys) if pkeys.size > 0
-
-          failed_keys = conn.keys("stat:failed:*")
-          earliest = "stat:failed:#{delete_before_date.to_s}"
-          fkeys = failed_keys.select { |key| key < earliest }
-          conn.del(fkeys) if fkeys.size > 0
-        end
-      end
-
       private
 
       def date_stat_hash(stat)
@@ -117,6 +93,10 @@ module Sidekiq
   class Queue
     include Enumerable
 
+    def self.all
+      Sidekiq.redis {|c| c.smembers('queues') }.map {|q| Sidekiq::Queue.new(q) }
+    end
+
     attr_reader :name
 
     def initialize(name="default")
@@ -195,7 +175,7 @@ module Sidekiq
     end
 
     def enqueued_at
-      Time.at(@item['enqueued_at'])
+      Time.at(@item['enqueued_at'] || 0)
     end
 
     def queue

data/lib/sidekiq/capistrano.rb

@@ -1,9 +1,6 @@
 Capistrano::Configuration.instance.load do
-  before "deploy:update_code", "sidekiq:quiet"
-  after "deploy:stop",    "sidekiq:stop"
-  after "deploy:start",   "sidekiq:start"
-  before "deploy:restart", "sidekiq:restart"
 
+  _cset(:sidekiq_default_hooks) { true }
   _cset(:sidekiq_cmd) { "#{fetch(:bundle_cmd, "bundle")} exec sidekiq" }
   _cset(:sidekiqctl_cmd) { "#{fetch(:bundle_cmd, "bundle")} exec sidekiqctl" }
   _cset(:sidekiq_timeout)   { 10 }
@@ -11,6 +8,13 @@ Capistrano::Configuration.instance.load do
   _cset(:sidekiq_pid)       { "#{current_path}/tmp/pids/sidekiq.pid" }
   _cset(:sidekiq_processes) { 1 }
 
+  if fetch(:sidekiq_default_hooks)
+    before "deploy:update_code", "sidekiq:quiet"
+    after "deploy:stop",    "sidekiq:stop"
+    after "deploy:start",   "sidekiq:start"
+    before "deploy:restart", "sidekiq:restart"
+  end
+
   namespace :sidekiq do
     def for_each_process(&block)
       fetch(:sidekiq_processes).times do |idx|

data/lib/sidekiq/cli.rb

@@ -52,8 +52,6 @@ module Sidekiq
       logger.info "Running in #{RUBY_DESCRIPTION}"
       logger.info Sidekiq::LICENSE
 
-      Sidekiq::Stats::History.cleanup
-
       if !options[:daemon]
         logger.info 'Starting processing, hit Ctrl-C to stop'
       end

data/lib/sidekiq/extensions/action_mailer.rb

@@ -3,7 +3,7 @@ require 'sidekiq/extensions/generic_proxy'
 module Sidekiq
   module Extensions
     ##
-    # Adds 'delay' and 'delay_for' to ActionMailer to offload arbitrary email
+    # Adds 'delay', 'delay_for' and `delay_until` methods to ActionMailer to offload arbitrary email
     # delivery to Sidekiq.  Example:
     #
     #    UserMailer.delay.send_welcome_email(new_user)

data/lib/sidekiq/extensions/active_record.rb

@@ -3,7 +3,7 @@ require 'sidekiq/extensions/generic_proxy'
 module Sidekiq
   module Extensions
     ##
-    # Adds a 'delay' method to ActiveRecords to offload instance method
+    # Adds 'delay', 'delay_for' and `delay_until` methods to ActiveRecord to offload instance method
     # execution to Sidekiq.  Examples:
     #
     # User.recent_signups.each { |user| user.delay.mark_as_awesome }

data/lib/sidekiq/extensions/class_methods.rb

@@ -3,7 +3,7 @@ require 'sidekiq/extensions/generic_proxy'
 module Sidekiq
   module Extensions
     ##
-    # Adds a 'delay' method to all Classes to offload class method
+    # Adds 'delay', 'delay_for' and `delay_until` methods to all Classes to offload class method
     # execution to Sidekiq.  Examples:
     #
     # User.delay.delete_inactive

data/lib/sidekiq/manager.rb

@@ -25,10 +25,11 @@ module Sidekiq
       @done_callback = nil
 
       @in_progress = {}
+      @threads = {}
       @done = false
       @busy = []
       @fetcher = Fetcher.new(current_actor, options)
-      @ready = @count.times.map { Processor.new_link(current_actor) }
+      @ready = @count.times.map { Processor.new_link(current_actor).tap {|p| p.proxy_id = p.object_id} }
     end
 
     def stop(options={})
@@ -63,6 +64,7 @@ module Sidekiq
       watchdog('Manager#processor_done died') do
         @done_callback.call(processor) if @done_callback
         @in_progress.delete(processor.object_id)
+        @threads.delete(processor.object_id)
         @busy.delete(processor)
         if stopped?
           processor.terminate if processor.alive?
@@ -77,10 +79,13 @@ module Sidekiq
     def processor_died(processor, reason)
       watchdog("Manager#processor_died died") do
         @in_progress.delete(processor.object_id)
+        @threads.delete(processor.object_id)
         @busy.delete(processor)
 
         unless stopped?
-          @ready << Processor.new_link(current_actor)
+          @ready << Processor.new_link(current_actor).tap do |p|
+            p.proxy_id = p.object_id
+          end
           dispatch
         else
           signal(:shutdown) if @busy.empty?
@@ -105,6 +110,14 @@ module Sidekiq
       end
     end
 
+    # A hack worthy of Rube Goldberg.  We need to be able
+    # to hard stop a working thread.  But there's no way for us to
+    # get handle to the underlying thread performing work for a processor
+    # so we have it call us and tell us.
+    def real_thread(proxy_id, thr)
+      @threads[proxy_id] = thr
+    end
+
     def procline(tag)
       "sidekiq #{Sidekiq::VERSION} #{tag}[#{@busy.size} of #{@count} busy]#{stopped? ? ' stopping' : ''}"
     end
@@ -145,10 +158,11 @@ module Sidekiq
           # it is worse to lose a job than to run it twice.
           Sidekiq::Fetcher.strategy.bulk_requeue(@in_progress.values)
 
-          logger.debug { "Terminating worker threads" }
+          logger.debug { "Terminating #{@busy.size} busy worker threads" }
           @busy.each do |processor|
-            t = processor.bare_object.actual_work_thread
-            t.raise Shutdown if processor.alive?
+            if processor.alive? && t = @threads.delete(processor.object_id)
+              t.raise Shutdown
+            end
           end
 
           after(0) { signal(:shutdown) }

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

@@ -43,13 +43,12 @@ module Sidekiq
       class RetryJobs
         include Sidekiq::Util
 
-        # delayed_job uses the same basic formula
         DEFAULT_MAX_RETRY_ATTEMPTS = 25
 
         def call(worker, msg, queue)
           yield
         rescue Sidekiq::Shutdown
-          # ignore, will be pushed back onto queue
+          # ignore, will be pushed back onto queue during hard_shutdown
           raise
         rescue Exception => e
           raise e unless msg['retry']
@@ -110,6 +109,7 @@ module Sidekiq
           end
         end
 
+        # delayed_job uses the same basic formula
         def seconds_to_delay(count)
           (count ** 4) + 15 + (rand(30)*(count+1))
         end

data/lib/sidekiq/processor.rb

@@ -11,11 +11,11 @@ module Sidekiq
   # processes it.  It instantiates the worker, runs the middleware
   # chain and then calls Sidekiq::Worker#perform.
   class Processor
+    STATS_TIMEOUT = 180 * 24 * 60 * 60
+
     include Util
     include Actor
 
-    task_class TaskThread
-
     def self.default_middleware
       Middleware::Chain.new do |m|
         m.add Middleware::Server::Logging
@@ -24,10 +24,7 @@ module Sidekiq
       end
     end
 
-    # store the actual working thread so we
-    # can later kill if it necessary during
-    # hard shutdown.
-    attr_accessor :actual_work_thread
+    attr_accessor :proxy_id
 
     def initialize(boss)
       @boss = boss
@@ -37,38 +34,56 @@ module Sidekiq
       msgstr = work.message
       queue = work.queue_name
 
-      @actual_work_thread = Thread.current
-      begin
-        msg = Sidekiq.load_json(msgstr)
-        klass  = msg['class'].constantize
-        worker = klass.new
-        worker.jid = msg['jid']
-
-        stats(worker, msg, queue) do
-          Sidekiq.server_middleware.invoke(worker, msg, queue) do
-            worker.perform(*cloned(msg['args']))
+      do_defer do
+        @boss.async.real_thread(proxy_id, Thread.current)
+
+        begin
+          msg = Sidekiq.load_json(msgstr)
+          klass  = msg['class'].constantize
+          worker = klass.new
+          worker.jid = msg['jid']
+
+          stats(worker, msg, queue) do
+            Sidekiq.server_middleware.invoke(worker, msg, queue) do
+              worker.perform(*cloned(msg['args']))
+            end
           end
+        rescue Sidekiq::Shutdown
+          # Had to force kill this job because it didn't finish
+          # within the timeout.
+        rescue Exception => ex
+          handle_exception(ex, msg || { :message => msgstr })
+          raise
+        ensure
+          work.acknowledge
         end
-      rescue Sidekiq::Shutdown
-        # Had to force kill this job because it didn't finish
-        # within the timeout.
-      rescue Exception => ex
-        handle_exception(ex, msg || { :message => msgstr })
-        raise
-      ensure
-        work.acknowledge
       end
 
       @boss.async.processor_done(current_actor)
     end
 
-    # See http://github.com/tarcieri/celluloid/issues/22
     def inspect
-      "#<Processor #{to_s}>"
+      "<Processor##{object_id.to_s(16)}>"
     end
 
     private
 
+    # We use Celluloid's defer to workaround tiny little
+    # Fiber stacks (4kb!) in MRI 1.9.
+    #
+    # For some reason, Celluloid's thread dispatch, TaskThread,
+    # is unstable under heavy concurrency but TaskFiber has proven
+    # itself stable.
+    NEED_DEFER = (RUBY_ENGINE == 'ruby' && RUBY_VERSION < '2.0.0')
+
+    def do_defer(&block)
+      if NEED_DEFER
+        defer(&block)
+      else
+        yield
+      end
+    end
+
     def identity
       @str ||= "#{hostname}:#{process_id}-#{Thread.current.object_id}:default"
     end
@@ -87,21 +102,25 @@ module Sidekiq
         yield
       rescue Exception
         redis do |conn|
-          conn.multi do
+          failed = "stat:failed:#{Time.now.utc.to_date}"
+          result = conn.multi do
             conn.incrby("stat:failed", 1)
-            conn.incrby("stat:failed:#{Time.now.utc.to_date}", 1)
+            conn.incrby(failed, 1)
           end
+          conn.expire(failed, STATS_TIMEOUT) if result.last == 1
         end
         raise
       ensure
         redis do |conn|
-          conn.multi do
+          processed = "stat:processed:#{Time.now.utc.to_date}"
+          result = conn.multi do
             conn.srem("workers", identity)
             conn.del("worker:#{identity}")
             conn.del("worker:#{identity}:started")
             conn.incrby("stat:processed", 1)
-            conn.incrby("stat:processed:#{Time.now.utc.to_date}", 1)
+            conn.incrby(processed, 1)
           end
+          conn.expire(processed, STATS_TIMEOUT) if result.last == 1
         end
       end
     end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.12.1"
+  VERSION = "2.12.3"
 end

data/lib/sidekiq/web.rb

@@ -2,7 +2,7 @@ require 'yaml'
 require 'sinatra/base'
 require 'slim'
 
-raise "The Sidekiq Web UI requires slim 1.3.8 or greater.  You have slim v#{Slim::VERSION}" if Gem::Version.new(Slim::VERSION) < Gem::Version.new('1.3.8')
+raise "The Sidekiq Web UI requires slim 1.1.0 or greater.  You have slim v#{Slim::VERSION}" if Gem::Version.new(Slim::VERSION) < Gem::Version.new('1.1.0')
 
 require 'sidekiq'
 require 'sidekiq/api'
@@ -41,9 +41,7 @@ module Sidekiq
       def reset_worker_list
         Sidekiq.redis do |conn|
           workers = conn.smembers('workers')
-          workers.each do |name|
-            conn.srem('workers', name)
-          end
+          conn.srem('workers', *workers)
         end
       end
 
@@ -104,13 +102,16 @@ module Sidekiq
       end
 
       def display_args(args, count=100)
-        args.map { |arg| a = arg.inspect; a.size > count ? "#{a[0..count]}..." : a }.join(", ")
+        args.map do |arg|
+          a = arg.inspect
+          a.size > count ? "#{a[0..count]}..." : a
+        end.join(", ")
       end
 
       RETRY_JOB_KEYS = Set.new(%w(
         queue class args retry_count retried_at failed_at
         jid error_message error_class backtrace
-        error_backtrace enqueued_at
+        error_backtrace enqueued_at retry
       ))
 
       def retry_extra_items(retry_job)
@@ -158,7 +159,7 @@ module Sidekiq
     end
 
     get "/queues" do
-      @queues = Sidekiq::Stats.new.queues
+      @queues = Sidekiq::Queue.all
       slim :queues
     end
 

data/sidekiq.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'celluloid', '>= 0.14.1'
   gem.add_dependency                  'json'
   gem.add_development_dependency      'sinatra'
-  gem.add_development_dependency      'slim'
+  gem.add_development_dependency      'slim', '>= 1.1.0'
   gem.add_development_dependency      'minitest', '~> 5'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'actionmailer'

data/test/helper.rb

@@ -20,6 +20,7 @@ end
 require 'minitest/autorun'
 require 'minitest/pride'
 
+require 'celluloid/autostart'
 require 'sidekiq'
 require 'sidekiq/util'
 Sidekiq.logger.level = Logger::ERROR

data/test/test_api.rb

@@ -127,32 +127,6 @@ class TestApi < Minitest::Test
           end
         end
       end
-
-      describe "cleanup" do
-        it 'removes processed stats outside of keep window' do
-          Sidekiq.redis do |c|
-            c.incrby("stat:processed:2012-05-03", 4)
-            c.incrby("stat:processed:2012-06-03", 4)
-            c.incrby("stat:processed:2012-07-03", 1)
-          end
-          Time.stub(:now, Time.parse("2012-12-01 1:00:00 -0500")) do
-            Sidekiq::Stats::History.cleanup
-            assert_equal false, Sidekiq.redis { |c| c.exists("stat:processed:2012-05-03") }
-          end
-        end
-
-        it 'removes failed stats outside of keep window' do
-          Sidekiq.redis do |c|
-            c.incrby("stat:failed:2012-05-03", 4)
-            c.incrby("stat:failed:2012-06-03", 4)
-            c.incrby("stat:failed:2012-07-03", 1)
-          end
-          Time.stub(:now, Time.parse("2012-12-01 1:00:00 -0500")) do
-            Sidekiq::Stats::History.cleanup
-            assert_equal false, Sidekiq.redis { |c| c.exists("stat:failed:2012-05-03") }
-          end
-        end
-      end
     end
   end
 

data/test/test_middleware.rb

@@ -82,6 +82,8 @@ class TestMiddleware < Minitest::Test
       processor = Sidekiq::Processor.new(boss)
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
+      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      boss.expect(:async, actor, [])
       boss.expect(:async, actor, [])
       processor.process(Sidekiq::BasicFetch::UnitOfWork.new('queue:default', msg))
       assert_equal %w(2 before 3 before 0 before work_performed 0 after 3 after 2 after), $recorder.flatten

data/test/test_processor.rb

@@ -31,6 +31,8 @@ class TestProcessor < Minitest::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])
+      @boss.expect(:async, actor, [])
       @boss.expect(:async, actor, [])
       @processor.process(work(msg))
       @boss.verify
@@ -38,6 +40,9 @@ class TestProcessor < Minitest::Test
     end
 
     it 'passes exceptions to ExceptionHandler' do
+      actor = Minitest::Mock.new
+      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      @boss.expect(:async, actor, [])
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
       begin
         @processor.process(work(msg))
@@ -51,6 +56,9 @@ class TestProcessor < Minitest::Test
     it 're-raises exceptions after handling' do
       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])
+      @boss.expect(:async, actor, [])
 
       begin
         @processor.process(work(msg))
@@ -67,6 +75,8 @@ class TestProcessor < Minitest::Test
       processor = ::Sidekiq::Processor.new(@boss)
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
+      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      @boss.expect(:async, actor, [])
       @boss.expect(:async, actor, [])
       processor.process(work(msgstr))
       assert_equal [['myarg']], msg['args']
@@ -77,12 +87,26 @@ class TestProcessor < Minitest::Test
         Sidekiq.redis {|c| c.flushdb }
       end
 
+      def with_expire(time)
+        begin
+          old = Sidekiq::Processor::STATS_TIMEOUT
+          silence_warnings { Sidekiq::Processor.const_set(:STATS_TIMEOUT, time) }
+          yield
+        ensure
+          silence_warnings { Sidekiq::Processor.const_set(:STATS_TIMEOUT, old) }
+        end
+      end
+
       describe 'when successful' do
+        let(:processed_today_key) { "stat:processed:#{Time.now.utc.to_date}" }
+
         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(:processor_done, nil, [@processor])
           @boss.expect(:async, actor, [])
+          @boss.expect(:async, actor, [])
           @processor.process(work(msg))
         end
 
@@ -91,17 +115,24 @@ class TestProcessor < Minitest::Test
           assert_equal 1, Sidekiq::Stats.new.processed
         end
 
+        it 'expires processed stat' do
+          successful_job
+          assert_equal Sidekiq::Processor::STATS_TIMEOUT, Sidekiq.redis { |conn| conn.ttl(processed_today_key) }
+        end
+
         it 'increments date processed stat' do
-          Time.stub(:now, Time.parse("2012-12-25 1:00:00 -0500")) do
-            successful_job
-            date_processed = Sidekiq.redis { |conn| conn.get("stat:processed:2012-12-25") }.to_i
-            assert_equal 1, date_processed
-          end
+          successful_job
+          assert_equal 1, Sidekiq.redis { |conn| conn.get(processed_today_key) }.to_i
         end
       end
 
       describe 'when failed' do
+        let(:failed_today_key) { "stat:failed:#{Time.now.utc.to_date}" }
+
         def failed_job
+          actor = Minitest::Mock.new
+          actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+          @boss.expect(:async, actor, [])
           msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
           begin
             @processor.process(work(msg))
@@ -115,14 +146,15 @@ class TestProcessor < Minitest::Test
         end
 
         it 'increments date failed stat' do
-          Time.stub(:now, Time.parse("2012-12-25 1:00:00 -0500")) do
-            failed_job
-            date_failed = Sidekiq.redis { |conn| conn.get("stat:failed:2012-12-25") }.to_i
-            assert_equal 1, date_failed
-          end
+          failed_job
+          assert_equal 1, Sidekiq.redis { |conn| conn.get(failed_today_key) }.to_i
         end
-      end
 
+        it 'expires failed stat' do
+          failed_job
+          assert_equal Sidekiq::Processor::STATS_TIMEOUT, Sidekiq.redis { |conn| conn.ttl(failed_today_key) }
+        end
+      end
     end
   end
 end

data/test/test_testing.rb

@@ -131,6 +131,7 @@ class TestTesting < Minitest::Test
     end
 
     it 'perform_one raise error upon empty queue' do
+      DirectWorker.clear
       assert_raises Sidekiq::EmptyQueueError do
         DirectWorker.perform_one
       end

data/web/views/queues.slim

@@ -5,11 +5,11 @@ table class="queues table table-hover table-bordered table-striped table-white"
     th = t('Queue')
     th = t('Size')
     th = t('Actions')
-  - @queues.each do |queue, size|
+  - @queues.each do |queue|
     tr
       td
-        a href="#{root_path}queues/#{queue}" #{queue}
-      td= number_with_delimiter(size)
+        a href="#{root_path}queues/#{queue.name}" #{queue.name}
+      td= number_with_delimiter(queue.size)
       td width="20%"
-        form action="#{root_path}queues/#{queue}" method="post"
-          input.btn.btn-danger.btn-small type="submit" name="delete" value="#{t('Delete')}" data-confirm="#{t('AreYouSureDeleteQueue', :queue => queue)}"
+        form action="#{root_path}queues/#{queue.name}" method="post"
+          input.btn.btn-danger.btn-small type="submit" name="delete" value="#{t('Delete')}" data-confirm="#{t('AreYouSureDeleteQueue', :queue => queue.name)}"

data/web/views/retry.slim

@@ -19,11 +19,15 @@ table class="retry table table-bordered table-striped"
       th JID
       td
         code= @retry.jid
+    tr
+      th = t('Enqueued')
+      td== relative_time(@retry.enqueued_at)
     - unless retry_extra_items(@retry).empty?
       tr
         th = t('Extras')
         td
-          code= display_args(retry_extra_items(@retry), 1000)
+          code
+            = retry_extra_items(@retry).inspect
     - if @retry['retry_count'] > 0
       tr
         th = t('RetryCount')
@@ -37,7 +41,7 @@ table class="retry table table-bordered table-striped"
         td== relative_time(@retry['failed_at'].is_a?(Numeric) ? Time.at(@retry['failed_at']) : Time.parse(@retry['failed_at']))
     tr
       th = t('NextRetry')
-      td== relative_time(Time.at(@retry.score))
+      td== relative_time(@retry.at)
 
 h3 = t('Error')
 table class="error table table-bordered table-striped"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement