sidekiq 1.1.4 → 1.2.0

data/COMM-LICENSE

@@ -26,7 +26,15 @@ You may not, without Our prior written consent, redistribute the Software or Mod
 
 UNDER NO CIRCUMSTANCES MAY YOU USE THE SOFTWARE FOR A PRODUCT THAT IS INTENDED FOR SOFTWARE OR APPLICATION DEVELOPMENT PURPOSES.
 
-The Open Source version of the Software (“GPL Version”) is licensed under the terms of the GNU General Public License versions 3.0 (“GPL”) and not under this License Agreement. If You, or another third party, has, at any time, developed all (or any portions of) the Application(s) using the GPL Version, You may not combine such development work with the Software and must license such Application(s) (or any portions derived there from) under the terms of the GNU General Public License version 3, a copy of which is located at http://www.gnu.org/copyleft/gpl.html.
+The Open Source version of the Software (“LGPL Version”) is licensed
+under the terms of the GNU Lesser General Public License versions 3.0
+(“LGPL”) and not under this License Agreement. If You, or another third
+party, has, at any time, developed all (or any portions of) the
+Application(s) using the LGPL Version, You may not combine such
+development work with the Software and must license such Application(s)
+(or any portions derived there from) under the terms of the GNU Lesser
+General Public License version 3, a copy of which is located at
+http://www.gnu.org/copyleft/lgpl.html.
 
 5. TERMINATION
 

data/Changes.md

@@ -1,3 +1,34 @@
+1.2.0
+-----------
+
+- Full or partial error backtraces can optionally be stored as part of the retry
+  for display in the web UI if you aren't using an error service. [#155]
+
+```ruby
+class Worker
+  include Sidekiq::Worker
+  sidekiq_options :backtrace => [true || 10]
+end
+```
+- Add timeout option to kill a worker after N seconds (blackgold9)
+
+```ruby
+class HangingWorker
+  include Sidekiq::Worker
+  sidekiq_options :timeout => 600
+  def perform
+    # will be killed if it takes longer than 10 minutes
+  end
+end
+```
+
+- Fix delayed extensions not available in workers [#152]
+- In test environments add the `#drain` class method to workers. This method
+  executes all previously queued jobs. (panthomakos)
+- Sidekiq workers can be run inline during tests, just `require 'sidekiq/testing/inline'` (panthomakos)
+- Queues can now be deleted from the Sidekiq web UI [#154]
+- Fix unnecessary shutdown delay due to Retry Poller [#174]
+
 1.1.4
 -----------
 

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 gem 'slim'
 gem 'sprockets'
 gem 'sass'
-gem 'rails'
+gem 'rails', '3.2.3'
 gem 'sqlite3'
 
 group :test do

data/bin/sidekiqctl

@@ -12,7 +12,7 @@ class Sidekiqctl
     @timeout = timeout
 
     done 'No pidfile given' if !pidfile
-    done 'Pidfile does not exist' if !File.exist?(pidfile)
+    done "Pidfile #{pidfile} does not exist" if !File.exist?(pidfile)
     done 'Invalid pidfile content' if pid == 0
 
     fetch_process

data/lib/sidekiq.rb

@@ -1,12 +1,12 @@
 require 'sidekiq/version'
 require 'sidekiq/client'
 require 'sidekiq/worker'
-require 'sidekiq/rails'
 require 'sidekiq/redis_connection'
 require 'sidekiq/util'
 
 require 'sidekiq/extensions/action_mailer'
 require 'sidekiq/extensions/active_record'
+require 'sidekiq/rails' if defined?(::Rails)
 
 module Sidekiq
 
@@ -83,21 +83,11 @@ module Sidekiq
   end
 
   def self.load_json(string)
-    # Can't reliably detect whether MultiJson responds to load, since it's
-    # a reserved word. Use adapter as a proxy for new features.
-    if MultiJson.respond_to?(:adapter)
-      MultiJson.load(string)
-    else
-      MultiJson.decode(string)
-    end
+    MultiJson.decode(string)
   end
 
   def self.dump_json(object)
-    if MultiJson.respond_to?(:dump)
-      MultiJson.dump(object)
-    else
-      MultiJson.encode(object)
-    end
+    MultiJson.encode(object)
   end
 
 end

data/lib/sidekiq/cli.rb

@@ -64,7 +64,7 @@ module Sidekiq
         sleep
       rescue Interrupt
         logger.info 'Shutting down'
-        poller.terminate if poller.alive?
+        poller.terminate! if poller.alive?
         @manager.stop!(:shutdown => true, :timeout => options[:timeout])
         @manager.wait(:shutdown)
         # Explicitly exit so busy Processor threads can't block
@@ -93,6 +93,8 @@ module Sidekiq
       raise ArgumentError, "#{options[:require]} does not exist" unless File.exist?(options[:require])
 
       if File.directory?(options[:require])
+        require 'rails'
+        require 'sidekiq/rails'
         require File.expand_path("#{options[:require]}/config/environment.rb")
         ::Rails.application.eager_load!
       else

data/lib/sidekiq/client.rb

@@ -26,6 +26,7 @@ module Sidekiq
     #   class - the worker class to call, required
     #   args - an array of simple arguments to the perform method, must be JSON-serializable
     #   retry - whether to retry this job if it fails, true or false, default true
+    #   backtrace - whether to save any error backtrace, default false
     #
     # All options must be strings, not symbols.  NB: because we are serializing to JSON, all
     # symbols in 'args' will be converted to strings.
@@ -38,11 +39,13 @@ module Sidekiq
       raise(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item['class'] || !item['args']
       raise(ArgumentError, "Message must include a Sidekiq::Worker class, not class name: #{item['class'].ancestors.inspect}") if !item['class'].is_a?(Class) || !item['class'].respond_to?('get_sidekiq_options')
 
-      item['retry'] = !!item['class'].get_sidekiq_options['retry']
-      queue = item['queue'] || item['class'].get_sidekiq_options['queue'] || 'default'
       worker_class = item['class']
       item['class'] = item['class'].to_s
 
+      item = worker_class.get_sidekiq_options.merge(item)
+      item['retry'] = !!item['retry']
+      queue = item['queue']
+
       pushed = false
       Sidekiq.client_middleware.invoke(worker_class, item, queue) do
         payload = Sidekiq.dump_json(item)
@@ -63,7 +66,7 @@ module Sidekiq
     # Messages are enqueued to the 'default' queue.
     #
     def self.enqueue(klass, *args)
-      push('class' => klass, 'args' => args)
+      klass.perform_async(*args)
     end
   end
 end

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

@@ -42,6 +42,12 @@ module Sidekiq
             msg['retry_count'] = 0
           end
 
+          if msg['backtrace'] == true
+            msg['error_backtrace'] = e.backtrace
+          elsif msg['backtrace'].to_i != 0
+            msg['error_backtrace'] = e.backtrace[0..msg['backtrace'].to_i]
+          end
+
           if count <= MAX_COUNT
             delay = DELAY.call(count)
             logger.debug { "Failure! Retry #{count} in #{delay} seconds" }

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

@@ -0,0 +1,21 @@
+require 'timeout'
+
+module Sidekiq
+  module Middleware
+    module Server
+      class Timeout
+
+        def call(worker, msg, queue)
+          if msg['timeout'] && msg['timeout'].to_i != 0
+            ::Timeout.timeout(msg['timeout'].to_i) do
+              yield
+            end
+          else
+            yield
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/sidekiq/processor.rb

@@ -6,6 +6,7 @@ require 'sidekiq/middleware/server/active_record'
 require 'sidekiq/middleware/server/exception_handler'
 require 'sidekiq/middleware/server/retry_jobs'
 require 'sidekiq/middleware/server/logging'
+require 'sidekiq/middleware/server/timeout'
 
 module Sidekiq
   class Processor
@@ -18,6 +19,7 @@ module Sidekiq
         m.add Middleware::Server::Logging
         m.add Middleware::Server::RetryJobs
         m.add Middleware::Server::ActiveRecord
+        m.add Middleware::Server::Timeout
       end
     end
 

data/lib/sidekiq/testing.rb

@@ -33,6 +33,12 @@ module Sidekiq
       def jobs
         @pushed ||= []
       end
+
+      def drain
+        while job = jobs.shift do
+          new.perform(*job['args'])
+        end
+      end
     end
   end
 end

data/lib/sidekiq/testing/inline.rb

@@ -0,0 +1,37 @@
+module Sidekiq
+  module Worker
+
+    ##
+    # The Sidekiq inline infrastructure overrides the perform_async so that it
+    # actually calls perform instead. This allows workers to be run inline in a
+    # testing environment.
+    #
+    # This is similar to `Resque.inline = true` functionality.
+    #
+    # Example:
+    #
+    #   require 'sidekiq/testing/inline'
+    #
+    #   $external_variable = 0
+    #
+    #   class ExternalWorker
+    #     include Sidekiq::Worker
+    #
+    #     def perform
+    #       $external_variable = 1
+    #     end
+    #   end
+    #
+    #   assert_equal 0, $external_variable
+    #   ExternalWorker.perform_async
+    #   assert_equal 1, $external_variable
+    #
+    module ClassMethods
+      alias_method :perform_async_old, :perform_async
+      def perform_async(*args)
+        new.perform(*args)
+        true
+      end
+    end
+  end
+end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

data/lib/sidekiq/web.rb

@@ -21,7 +21,7 @@ module Sidekiq
     def call(env)
       # Solve the problem of people requesting /sidekiq when they need to request /sidekiq/ so
       # that relative links in templates resolve correctly.
-      return [301, { 'Location' => "#{env['SCRIPT_NAME']}/" }, ['redirecting']] if env['SCRIPT_NAME'] == env['REQUEST_PATH']
+      return [301, { 'Location' => "#{env['SCRIPT_NAME']}/", 'Content-Type' => 'text/html' }, ['redirecting']] if env['SCRIPT_NAME'] == env['REQUEST_PATH']
 
       return @app.call(env) unless @matcher =~ env["PATH_INFO"]
       env['PATH_INFO'].sub!(@matcher,'')
@@ -38,15 +38,6 @@ module Sidekiq
 
     helpers do
 
-      def reset_worker_list
-        Sidekiq.redis do |conn|
-          workers = conn.smembers('workers')
-          workers.each do |name|
-            conn.srem('workers', name)
-          end
-        end
-      end
-
       def workers
         @workers ||= begin
           Sidekiq.redis do |conn|
@@ -114,21 +105,27 @@ module Sidekiq
       slim :index
     end
 
-    post "/reset" do
-      reset_worker_list
-      redirect root_path
-    end
-
     get "/queues/:name" do
       halt 404 unless params[:name]
+      count = (params[:count] || 10).to_i
       @name = params[:name]
-      @messages = Sidekiq.redis {|conn| conn.lrange("queue:#{@name}", 0, 10) }.map { |str| Sidekiq.load_json(str) }
+      @messages = Sidekiq.redis {|conn| conn.lrange("queue:#{@name}", 0, count) }.map { |str| Sidekiq.load_json(str) }
       slim :queue
     end
 
+    post "/queues/:name" do
+      Sidekiq.redis do |conn|
+        conn.del("queue:#{params[:name]}")
+        conn.srem("queues", params[:name])
+      end
+      redirect root_path
+    end
+
     get "/retries/:score" do
       halt 404 unless params[:score]
       @score = params[:score].to_f
+      @retries = retries_with_score(@score)
+      redirect root_path if @retries.empty?
       slim :retry
     end
 

data/lib/sidekiq/worker.rb

@@ -36,6 +36,9 @@ module Sidekiq
       #   :unique - enable the UniqueJobs middleware for this Worker, default *true*
       #   :queue - use a named queue for this Worker, default 'default'
       #   :retry - enable the RetryJobs middleware for this Worker, default *true*
+      #   :timeout - timeout the perform method after N seconds, default *nil*
+      #   :backtrace - whether to save any error backtrace in the retry payload to display in web UI,
+      #      can be true, false or an integer number of lines to save, default *false*
       def sidekiq_options(opts={})
         @sidekiq_options = get_sidekiq_options.merge(stringify_keys(opts || {}))
       end

data/lib/sidekiq/yaml_patch.rb

@@ -0,0 +1,21 @@
+# YAML marshalling of instances can fail in some circumstances,
+# e.g. when the instance has a handle to a Proc.  This monkeypatch limits
+# the YAML serialization to just AR's internal @attributes hash.
+# The paperclip gem litters AR instances with Procs, for instance.
+#
+# Courtesy of @ryanlecompte https://gist.github.com/007b88ae90372d1a3321
+#
+
+if defined?(::ActiveRecord)
+  class ActiveRecord::Base
+    yaml_as "tag:ruby.yaml.org,2002:ActiveRecord"
+
+    def self.yaml_new(klass, tag, val)
+      klass.unscoped.find(val['attributes'][klass.primary_key])
+    end
+
+    def to_yaml_properties
+      ['@attributes']
+    end
+  end
+end

data/myapp/app/workers/hard_worker.rb

@@ -1,5 +1,6 @@
 class HardWorker
   include Sidekiq::Worker
+  sidekiq_options :timeout => 60, :backtrace => 5, :timeout => 20
 
   def perform(name, count, salt)
     raise name if name == 'crash'

data/sidekiq.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis-namespace'
   gem.add_dependency                  'connection_pool', '~> 0.9.0'
   gem.add_dependency                  'celluloid', '~> 0.10.0'
-  gem.add_dependency                  'multi_json', '~> 1.0'
+  gem.add_dependency                  'multi_json', '~> 1'
   gem.add_development_dependency      'minitest'
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'slim'

data/test/helper.rb

@@ -1,3 +1,4 @@
+ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
 if ENV.has_key?("SIMPLECOV")
   require 'simplecov'
   SimpleCov.start

data/test/test_client.rb

@@ -96,8 +96,7 @@ class TestClient < MiniTest::Unit::TestCase
 
     class QueuedWorker
       include Sidekiq::Worker
-
-      sidekiq_options :queue => :flimflam
+      sidekiq_options :queue => :flimflam, :timeout => 1
     end
 
     it 'enqueues to the named queue' do

data/test/test_extensions.rb

@@ -4,6 +4,7 @@ require 'active_record'
 require 'action_mailer'
 require 'sidekiq/extensions/action_mailer'
 require 'sidekiq/extensions/active_record'
+require 'sidekiq/rails'
 
 Sidekiq.hook_rails!
 
@@ -20,7 +21,7 @@ class TestExtensions < MiniTest::Unit::TestCase
       end
     end
 
-    it 'allows delayed exection of ActiveRecord class methods' do
+    it 'allows delayed execution of ActiveRecord class methods' do
       assert_equal [], Sidekiq::Client.registered_queues
       assert_equal 0, Sidekiq.redis {|c| c.llen('queue:default') }
       MyModel.delay.long_class_method

data/test/test_manager.rb

@@ -16,6 +16,7 @@ class TestManager < MiniTest::Unit::TestCase
 
     class IntegrationWorker
       include Sidekiq::Worker
+      sidekiq_options :queue => 'foo'
 
       def perform(a, b)
         $mutex.synchronize do
@@ -26,8 +27,8 @@ class TestManager < MiniTest::Unit::TestCase
     end
 
     it 'processes messages' do
-      Sidekiq::Client.push('queue' => :foo, 'class' => IntegrationWorker, 'args' => [1, 2])
-      Sidekiq::Client.push('queue' => :foo, 'class' => IntegrationWorker, 'args' => [1, 3])
+      IntegrationWorker.perform_async(1, 2)
+      IntegrationWorker.perform_async(1, 3)
 
       q = TimedQueue.new
       mgr = Sidekiq::Manager.new(:queues => [:foo], :concurrency => 2)

data/test/test_retry.rb

@@ -25,6 +25,34 @@ class TestRetry < MiniTest::Unit::TestCase
       assert_equal msg, msg2
     end
 
+    it 'saves backtraces' do
+      @redis.expect :zadd, 1, ['retry', String, String]
+      msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => true, 'backtrace' => true }
+      handler = Sidekiq::Middleware::Server::RetryJobs.new
+      c = nil
+      assert_raises RuntimeError do
+        handler.call('', msg, 'default') do
+          c = caller(0); raise "kerblammo!"
+        end
+      end
+      assert msg["error_backtrace"]
+      assert_equal c, msg["error_backtrace"]
+    end
+
+    it 'saves partial backtraces' do
+      @redis.expect :zadd, 1, ['retry', String, String]
+      msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => true, 'backtrace' => 3 }
+      handler = Sidekiq::Middleware::Server::RetryJobs.new
+      c = nil
+      assert_raises RuntimeError do
+        handler.call('', msg, 'default') do
+          c = caller(0)[0..3]; raise "kerblammo!"
+        end
+      end
+      assert msg["error_backtrace"]
+      assert_equal c, msg["error_backtrace"]
+    end
+
     it 'handles a new failed message' do
       @redis.expect :zadd, 1, ['retry', String, String]
       msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => true }
@@ -38,6 +66,7 @@ class TestRetry < MiniTest::Unit::TestCase
       assert_equal 'kerblammo!', msg["error_message"]
       assert_equal 'RuntimeError', msg["error_class"]
       assert_equal 0, msg["retry_count"]
+      refute msg["error_backtrace"]
       assert msg["failed_at"]
       @redis.verify
     end

data/test/test_testing.rb

@@ -3,6 +3,7 @@ require 'sidekiq'
 require 'sidekiq/worker'
 require 'active_record'
 require 'action_mailer'
+require 'sidekiq/rails'
 require 'sidekiq/extensions/action_mailer'
 require 'sidekiq/extensions/active_record'
 
@@ -10,6 +11,7 @@ Sidekiq.hook_rails!
 
 class TestTesting < MiniTest::Unit::TestCase
   describe 'sidekiq testing' do
+    class PerformError < RuntimeError; end
 
     class DirectWorker
       include Sidekiq::Worker
@@ -18,6 +20,20 @@ class TestTesting < MiniTest::Unit::TestCase
       end
     end
 
+    class EnqueuedWorker
+      include Sidekiq::Worker
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    class StoredWorker
+      include Sidekiq::Worker
+      def perform(error)
+        raise PerformError if error
+      end
+    end
+
     class FooMailer < ActionMailer::Base
       def bar(str)
         str
@@ -31,7 +47,7 @@ class TestTesting < MiniTest::Unit::TestCase
     end
 
     before do
-      require 'sidekiq/testing'
+      load 'sidekiq/testing.rb'
     end
 
     after do
@@ -43,23 +59,39 @@ class TestTesting < MiniTest::Unit::TestCase
       end
     end
 
-    it 'stubs the async call when in testing mode' do
-      # We can only have one it block here so all 'testing' tests
-      # have to go here because require 'sidekiq/testing' changes
-      # how Sidekiq works and we need to roll back those changes
-      # when the test is done.
+    it 'stubs the async call' do
       assert_equal 0, DirectWorker.jobs.size
       assert DirectWorker.perform_async(1, 2)
       assert_equal 1, DirectWorker.jobs.size
+    end
 
+    it 'stubs the delay call on mailers' do
       assert_equal 0, Sidekiq::Extensions::DelayedMailer.jobs.size
       FooMailer.delay.bar('hello!')
       assert_equal 1, Sidekiq::Extensions::DelayedMailer.jobs.size
+    end
 
+    it 'stubs the delay call on models' do
       assert_equal 0, Sidekiq::Extensions::DelayedModel.jobs.size
       FooModel.delay.bar('hello!')
       assert_equal 1, Sidekiq::Extensions::DelayedModel.jobs.size
     end
 
+    it 'stubs the enqueue call' do
+      assert_equal 0, EnqueuedWorker.jobs.size
+      assert Sidekiq::Client.enqueue(EnqueuedWorker, 1, 2)
+      assert_equal 1, EnqueuedWorker.jobs.size
+    end
+
+    it 'executes all stored jobs' do
+      assert StoredWorker.perform_async(false)
+      assert StoredWorker.perform_async(true)
+
+      assert_equal 2, StoredWorker.jobs.size
+      assert_raises PerformError do
+        StoredWorker.drain
+      end
+      assert_equal 0, StoredWorker.jobs.size
+    end
   end
 end

data/test/test_testing_inline.rb

@@ -0,0 +1,75 @@
+require 'helper'
+require 'sidekiq'
+require 'sidekiq/worker'
+require 'active_record'
+require 'action_mailer'
+require 'sidekiq/rails'
+require 'sidekiq/extensions/action_mailer'
+require 'sidekiq/extensions/active_record'
+
+Sidekiq.hook_rails!
+
+class TestInline < MiniTest::Unit::TestCase
+  describe 'sidekiq inline testing' do
+    class InlineError < RuntimeError; end
+
+    class InlineWorker
+      include Sidekiq::Worker
+      def perform(pass)
+        raise InlineError unless pass
+      end
+    end
+
+    class InlineFooMailer < ActionMailer::Base
+      def bar(str)
+        raise InlineError
+      end
+    end
+
+    class InlineFooModel < ActiveRecord::Base
+      def self.bar(str)
+        raise InlineError
+      end
+    end
+
+    before do
+      load 'sidekiq/testing/inline.rb'
+    end
+
+    after do
+      Sidekiq::Worker::ClassMethods.class_eval do
+        remove_method :perform_async
+        alias_method :perform_async, :perform_async_old
+        remove_method :perform_async_old
+      end
+    end
+
+    it 'stubs the async call when in testing mode' do
+      assert InlineWorker.perform_async(true)
+
+      assert_raises InlineError do
+        InlineWorker.perform_async(false)
+      end
+    end
+
+    it 'stubs the delay call on mailers' do
+      assert_raises InlineError do
+        InlineFooMailer.delay.bar('three')
+      end
+    end
+
+    it 'stubs the delay call on models' do
+      assert_raises InlineError do
+        InlineFooModel.delay.bar('three')
+      end
+    end
+
+    it 'stubs the enqueue call when in testing mode' do
+      assert Sidekiq::Client.enqueue(InlineWorker, true)
+
+      assert_raises InlineError do
+        Sidekiq::Client.enqueue(InlineWorker, false)
+      end
+    end
+  end
+end

data/test/test_web.rb

@@ -52,10 +52,31 @@ class TestWeb < MiniTest::Unit::TestCase
       assert_equal 404, last_response.status
     end
 
+    it 'handles missing retry' do
+      get '/retries/12391982.123'
+      assert_equal 302, last_response.status
+    end
+
     it 'handles queue view' do
       get '/queues/default'
       assert_equal 200, last_response.status
     end
 
+    it 'can delete a queue' do
+      Sidekiq.redis do |conn|
+        conn.rpush('queue:foo', '{}')
+        conn.sadd('queues', 'foo')
+      end
+
+      get '/queues/foo'
+      assert_equal 200, last_response.status
+
+      post '/queues/foo'
+      assert_equal 302, last_response.status
+
+      Sidekiq.redis do |conn|
+        refute conn.smembers('queues').include?('foo')
+      end
+    end
   end
 end

data/web/assets/stylesheets/application.css

@@ -1,11 +1,23 @@
 /*
-*= require_self
 *= require vendor/bootstrap
 *= require vendor/bootstrap-responsive
+*= require_self
 */
 body {
   position: relative;
   padding-top: 90px;
-  background-color: #aaa;
 }
 
+td form {
+  margin: 0;
+}
+
+td form .btn {
+  margin: 0;
+}
+
+code {
+  padding: 0;
+  border: 0;
+  background-color: inherit;
+}

data/web/views/index.slim

@@ -30,19 +30,21 @@
             td= msg['payload']['class']
             td= msg['payload']['args'].inspect[0..100]
             td== relative_time(Time.parse(msg['run_at']))
-      form action="#{root_path}reset" method="post"
-        button.btn type="submit" Clear worker list
 
     #queues.tab-pane
       table class="table table-striped table-bordered"
         tr
           th Queue
           th Size
+          th
         - queues.each do |(queue, size)|
           tr
             td
-              a href="queues/#{queue}" #{queue}
+              a href="#{root_path}queues/#{queue}" #{queue}
             td= size
+            td
+              form action="#{root_path}queues/#{queue}" method="post"
+                input.btn.btn-danger type="submit" name="delete" value="Delete"
 
     #retries.tab-pane
       table class="table table-striped table-bordered"

data/web/views/retry.slim

@@ -1,7 +1,7 @@
 header
-  h1 Retry Job
+  h1 Job
 
-- retries_with_score(@score).each do |msg|
+- @retries.each do |msg|
   table class="table table-striped table-bordered"
     tbody
       tr
@@ -16,13 +16,6 @@ header
         th Job Arguments
         td
           code= msg['args'].inspect[0..1000]
-      tr
-        th Error Class
-        td
-          code= msg['error_class']
-      tr
-        th Error Message
-        td= msg['error_message']
       - if msg['retry_count'] > 0
         tr
           th Retry Count
@@ -38,6 +31,21 @@ header
         th Next Retry
         td== relative_time(Time.at(@score))
 
+  h1 Error
+  table class="table table-striped table-bordered"
+    tbody
+      tr
+        th Error Class
+        td
+          code= msg['error_class']
+      tr
+        th Error Message
+        td= msg['error_message']
+      - if !msg['error_backtrace'].nil?
+        tr
+          th Error Backtrace
+          td
+            code== msg['error_backtrace'].join("<br/>")
   form.form-horizontal action="#{root_path}retries/#{@score}" method="post"
     a.btn href="#{root_path}" &larr; Back
     input.btn.btn-primary type="submit" name="retry" value="Retry Now"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70161328001220 !ruby/object:Gem::Requirement
+  requirement: &70181602671160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161328001220
+  version_requirements: *70181602671160
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70161328000340 !ruby/object:Gem::Requirement
+  requirement: &70181602670700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161328000340
+  version_requirements: *70181602670700
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70161327999200 !ruby/object:Gem::Requirement
+  requirement: &70181602669980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70161327999200
+  version_requirements: *70181602669980
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70161327998620 !ruby/object:Gem::Requirement
+  requirement: &70181602669040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70161327998620
+  version_requirements: *70181602669040
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70161327997960 !ruby/object:Gem::Requirement
+  requirement: &70181602668580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *70161327997960
+  version_requirements: *70181602668580
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70161327996900 !ruby/object:Gem::Requirement
+  requirement: &70181602684540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161327996900
+  version_requirements: *70181602684540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70161327996420 !ruby/object:Gem::Requirement
+  requirement: &70181602683860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161327996420
+  version_requirements: *70181602683860
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70161328012260 !ruby/object:Gem::Requirement
+  requirement: &70181602683240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161328012260
+  version_requirements: *70181602683240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70161328011740 !ruby/object:Gem::Requirement
+  requirement: &70181602682820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161328011740
+  version_requirements: *70181602682820
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70161328011180 !ruby/object:Gem::Requirement
+  requirement: &70181602682300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70161328011180
+  version_requirements: *70181602682300
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70161328010660 !ruby/object:Gem::Requirement
+  requirement: &70181602681760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70161328010660
+  version_requirements: *70181602681760
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -181,16 +181,19 @@ files:
 - lib/sidekiq/middleware/server/failure_jobs.rb
 - lib/sidekiq/middleware/server/logging.rb
 - lib/sidekiq/middleware/server/retry_jobs.rb
+- lib/sidekiq/middleware/server/timeout.rb
 - lib/sidekiq/middleware/server/unique_jobs.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
 - lib/sidekiq/redis_connection.rb
 - lib/sidekiq/retry.rb
 - lib/sidekiq/testing.rb
+- lib/sidekiq/testing/inline.rb
 - lib/sidekiq/util.rb
 - lib/sidekiq/version.rb
 - lib/sidekiq/web.rb
 - lib/sidekiq/worker.rb
+- lib/sidekiq/yaml_patch.rb
 - myapp/.gitignore
 - myapp/Capfile
 - myapp/Gemfile
@@ -243,6 +246,7 @@ files:
 - test/test_retry.rb
 - test/test_stats.rb
 - test/test_testing.rb
+- test/test_testing_inline.rb
 - test/test_web.rb
 - web/assets/images/bootstrap/glyphicons-halflings-white.png
 - web/assets/images/bootstrap/glyphicons-halflings.png
@@ -306,4 +310,5 @@ test_files:
 - test/test_retry.rb
 - test/test_stats.rb
 - test/test_testing.rb
+- test/test_testing_inline.rb
 - test/test_web.rb