sidekiq 2.1.0 → 2.1.1

data/Changes.md

@@ -1,3 +1,10 @@
+2.1.1
+-----------
+
+- Handle networking errors causing the scheduler thread to die [#309]
+- Rework exception handling to log all Processor and actor death (#325, subelsky)
+- Clone arguments when calling worker so modifications are discarded. (#265, hakanensari)
+
 2.1.0
 -----------
 
@@ -6,8 +13,8 @@
   usage.
 - Add pagination within the Web UI [#253]
 - Specify which Redis driver to use: *hiredis* or *ruby* (default)
-- Remove FailureJobs and UniqueJobs, which have been optional server
-  middleware. [#302]
+- Remove FailureJobs and UniqueJobs, which were optional middleware
+  that I don't want to support in core. [#302]
 
 2.0.3
 -----------

data/README.md

@@ -27,6 +27,8 @@ Requirements
 I test on Ruby 1.9.3 and JRuby 1.6.x in 1.9 mode.  Other versions/VMs are
 untested but I will do my best to support them.  Ruby 1.8 is not supported.
 
+Redis 2.0 or greater is required.
+
 
 Installation
 -----------------
@@ -38,6 +40,7 @@ Getting Started
 -----------------
 
 See the [sidekiq home page](http://mperham.github.com/sidekiq) for the simple 4-step process.
+You can watch [Railscast #366](http://railscasts.com/episodes/366-sidekiq) to see Sidekiq in action.
 
 
 More Information
@@ -52,6 +55,14 @@ and email to <sidekiq@librelist.org> with a greeting in the body. To unsubscribe
 Once archiving begins, you'll be able to visit [the archives](http://librelist.com/browser/sidekiq/) to see past threads.
 
 
+Problems?
+-----------------
+
+**Please do not directly email any Sidekiq committers with questions or problems.**  A community is best served when discussions are held in public.
+
+If you have a problem, please review the [FAQ](/mperham/sidekiq/wiki/FAQ) and [Troubleshooting](/mperham/sidekiq/wiki/Problems-and-Troubleshooting) wiki pages.  Searching the issues for your problem is also a good idea.  If that doesn't help, feel free to email the Sidekiq mailing list or open a new issue.
+
+
 License
 -----------------
 

data/lib/sidekiq/cli.rb

@@ -124,7 +124,6 @@ module Sidekiq
 
     def validate!
       options[:queues] << 'default' if options[:queues].empty?
-      options[:queues].shuffle!
 
       if !File.exist?(options[:require]) ||
          (File.directory?(options[:require]) && !File.exist?("#{options[:require]}/config/application.rb"))
@@ -141,9 +140,10 @@ module Sidekiq
       opts = {}
 
       @parser = OptionParser.new do |o|
-         o.on "-q", "--queue QUEUE,WEIGHT", "Queue to process, with optional weight" do |arg|
-          q, weight = arg.split(",")
-          parse_queues(opts, q, weight)
+        o.on "-q", "--queue QUEUE[,WEIGHT]...", "Queues to process with optional weights" do |arg|
+          queues_and_weights = arg.scan(/(\w+),?(\d*)/)
+          queues_and_weights.each {|queue_and_weight| parse_queues(opts, *queue_and_weight)}
+          opts[:strict] = queues_and_weights.collect(&:last).none? {|weight| weight != ''}
         end
 
         o.on "-v", "--verbose", "Print more verbose output" do
@@ -208,7 +208,7 @@ module Sidekiq
     end
 
     def parse_queues(opts, q, weight)
-      (weight || 1).to_i.times do
+      [weight.to_i, 1].max.times do
        (opts[:queues] ||= []) << q
       end
     end

data/lib/sidekiq/exception_handler.rb

@@ -0,0 +1,30 @@
+module Sidekiq
+  module ExceptionHandler
+
+    def handle_exception(ex, msg)
+      Sidekiq.logger.warn msg
+      Sidekiq.logger.warn ex
+      Sidekiq.logger.warn ex.backtrace.join("\n")
+      send_to_airbrake(msg, ex) if defined?(::Airbrake)
+      send_to_exceptional(msg, ex) if defined?(::Exceptional)
+      send_to_exception_notifier(msg, ex) if defined?(::ExceptionNotifier)
+    end
+
+    private
+
+    def send_to_airbrake(msg, ex)
+      ::Airbrake.notify(ex, :parameters => msg)
+    end
+
+    def send_to_exceptional(msg, ex)
+      if ::Exceptional::Config.should_send_to_api?
+        ::Exceptional.context(msg)
+        ::Exceptional::Remote.error(::Exceptional::ExceptionData.new(ex))
+      end
+    end
+
+    def send_to_exception_notifier(msg, ex)
+      ::ExceptionNotifier::Notifier.background_exception_notification(ex, :data => { :message => msg })
+    end
+  end
+end

data/lib/sidekiq/fetch.rb

@@ -12,8 +12,9 @@ module Sidekiq
 
     TIMEOUT = 1
 
-    def initialize(mgr, queues)
+    def initialize(mgr, queues, strict)
       @mgr = mgr
+      @strictly_ordered_queues = strict
       @queues = queues.map { |q| "queue:#{q}" }
       @unique_queues = @queues.uniq
     end
@@ -68,6 +69,7 @@ module Sidekiq
     # recreate the queue command each time we invoke Redis#blpop
     # to honor weights and avoid queue starvation.
     def queues_cmd
+      return @unique_queues.dup << TIMEOUT if @strictly_ordered_queues
       queues = @queues.sample(@unique_queues.size).uniq
       queues.concat(@unique_queues - queues)
       queues << TIMEOUT

data/lib/sidekiq/manager.rb

@@ -27,7 +27,7 @@ module Sidekiq
       @in_progress = {}
       @done = false
       @busy = []
-      @fetcher = Fetcher.new(current_actor, options[:queues])
+      @fetcher = Fetcher.new(current_actor, options[:queues], !!options[:strict])
       @ready = @count.times.map { Processor.new_link(current_actor) }
       procline
     end

data/lib/sidekiq/processor.rb

@@ -2,7 +2,6 @@ require 'celluloid'
 require 'sidekiq/util'
 
 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'
@@ -20,7 +19,6 @@ module Sidekiq
 
     def self.default_middleware
       Middleware::Chain.new do |m|
-        m.add Middleware::Server::ExceptionHandler
         m.add Middleware::Server::Logging
         m.add Middleware::Server::RetryJobs
         m.add Middleware::Server::ActiveRecord
@@ -39,10 +37,13 @@ module Sidekiq
 
       stats(worker, msg, queue) do
         Sidekiq.server_middleware.invoke(worker, msg, queue) do
-          worker.perform(*msg['args'])
+          worker.perform(*cloned(msg['args']))
         end
       end
       @boss.processor_done!(current_actor)
+    rescue => ex
+      handle_exception(ex, msg || { :message => msgstr })
+      raise
     end
 
     # See http://github.com/tarcieri/celluloid/issues/22
@@ -87,7 +88,18 @@ module Sidekiq
           end
         end
       end
+    end
+
+    # Singleton classes are not clonable.
+    SINGLETON_CLASSES = [ NilClass, TrueClass, FalseClass, Symbol, Fixnum, Float ].freeze
 
+    # Clone the arguments passed to the worker so that if
+    # the message fails, what is pushed back onto Redis hasn't
+    # been mutated by the worker.
+    def cloned(ary)
+      ary.map do |val|
+        SINGLETON_CLASSES.include?(val.class) ? val : val.clone
+      end
     end
 
     def hostname

data/lib/sidekiq/scheduled.rb

@@ -22,25 +22,31 @@ module Sidekiq
         watchdog('scheduling poller thread died!') do
           add_jitter if first_time
 
-          # A message's "score" in Redis is the time at which it should be processed.
-          # Just check Redis for the set of messages with a timestamp before now.
-          now = Time.now.to_f.to_s
-          Sidekiq.redis do |conn|
-            SETS.each do |sorted_set|
-              (messages, _) = conn.multi do
-                conn.zrangebyscore(sorted_set, '-inf', now)
-                conn.zremrangebyscore(sorted_set, '-inf', now)
-              end
+          begin
+            # A message's "score" in Redis is the time at which it should be processed.
+            # Just check Redis for the set of messages with a timestamp before now.
+            now = Time.now.to_f.to_s
+            Sidekiq.redis do |conn|
+              SETS.each do |sorted_set|
+                (messages, _) = conn.multi do
+                  conn.zrangebyscore(sorted_set, '-inf', now)
+                  conn.zremrangebyscore(sorted_set, '-inf', now)
+                end
 
-              messages.each do |message|
-                logger.debug { "enqueued #{sorted_set}: #{message}" }
-                msg = Sidekiq.load_json(message)
-                conn.multi do
-                  conn.sadd('queues', msg['queue'])
-                  conn.rpush("queue:#{msg['queue']}", message)
+                messages.each do |message|
+                  logger.debug { "enqueued #{sorted_set}: #{message}" }
+                  msg = Sidekiq.load_json(message)
+                  conn.multi do
+                    conn.sadd('queues', msg['queue'])
+                    conn.rpush("queue:#{msg['queue']}", message)
+                  end
                 end
               end
             end
+          rescue SystemCallError => ex
+            # ECONNREFUSED, etc.  Most likely a problem with
+            # redis networking.  Punt and try again at the next interval
+            logger.warn ex.message
           end
 
           after(poll_interval) { poll }

data/lib/sidekiq/util.rb

@@ -1,8 +1,11 @@
+require 'sidekiq/exception_handler'
+
 module Sidekiq
   ##
   # This module is part of Sidekiq core and not intended for extensions.
   #
   module Util
+    include ExceptionHandler
 
     EXPIRY = 60 * 60
 
@@ -20,9 +23,7 @@ module Sidekiq
     def watchdog(last_words)
       yield
     rescue => ex
-      logger.error last_words
-      logger.error ex
-      logger.error ex.backtrace.join("\n")
+      handle_exception(ex, { :context => last_words })
     end
 
     def logger

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/sidekiq/web.rb

@@ -117,6 +117,10 @@ module Sidekiq
       slim :index
     end
 
+    get "/poll" do
+      slim :poll, layout: false
+    end
+
     get "/queues" do
       @queues = queues
       slim :queues

data/test/test_cli.rb

@@ -40,14 +40,29 @@ class TestCli < MiniTest::Unit::TestCase
       assert_equal ['foo'], Sidekiq.options[:queues]
     end
 
+    it 'sets strictly ordered queues if weights are not present' do
+      @cli.parse(['sidekiq', '-q', 'foo,bar', '-r', './test/fake_env.rb'])
+      assert_equal true, !!Sidekiq.options[:strict]
+    end
+
+    it 'does not set strictly ordered queues if weights are present' do
+      @cli.parse(['sidekiq', '-q', 'foo,3', '-r', './test/fake_env.rb'])
+      assert_equal false, !!Sidekiq.options[:strict]
+    end
+
     it 'changes timeout' do
       @cli.parse(['sidekiq', '-t', '30', '-r', './test/fake_env.rb'])
       assert_equal 30, Sidekiq.options[:timeout]
     end
 
-    it 'handles multiple queues with weights' do
+    it 'handles multiple queues with weights with multiple switches' do
       @cli.parse(['sidekiq', '-q', 'foo,3', '-q', 'bar', '-r', './test/fake_env.rb'])
-      assert_equal %w(bar foo foo foo), Sidekiq.options[:queues].sort
+      assert_equal %w(foo foo foo bar), Sidekiq.options[:queues]
+    end
+
+    it 'handles multiple queues with weights with a single switch' do
+      @cli.parse(['sidekiq', '-q', 'bar,foo,3', '-r', './test/fake_env.rb'])
+      assert_equal %w(bar foo foo foo), Sidekiq.options[:queues]
     end
 
     it 'sets verbose' do
@@ -163,6 +178,24 @@ class TestCli < MiniTest::Unit::TestCase
         assert_equal 3, Sidekiq.options[:queues].count { |q| q == 'seldom' }
       end
     end
+
+    describe 'Sidekiq::CLI#parse_queues' do
+      describe 'when weight is present' do
+        it 'concatenates queue to opts[:queues] weight number of times' do
+          opts = {}
+          @cli.send :parse_queues, opts, 'often', 7
+          assert_equal %w[often] * 7, opts[:queues]
+        end
+      end
+
+      describe 'when weight is not present' do
+        it 'concatenates queue to opts[:queues] once' do
+          opts = {}
+          @cli.send :parse_queues, opts, 'once', nil
+          assert_equal %w[once], opts[:queues]
+        end
+      end
+    end
   end
 
 end

data/test/test_exception_handler.rb

@@ -0,0 +1,109 @@
+require 'helper'
+require 'sidekiq'
+require 'sidekiq/exception_handler'
+require 'stringio'
+require 'logger'
+
+ExceptionHandlerTestException = Class.new(StandardError)
+TEST_EXCEPTION = ExceptionHandlerTestException.new("Something didn't work!")
+
+class Component
+  include Sidekiq::Util
+
+  def invoke_exception(args)
+    raise TEST_EXCEPTION
+  rescue ExceptionHandlerTestException => e
+    handle_exception(e,args)
+  end
+end
+
+class TestExceptionHandler < MiniTest::Unit::TestCase
+  describe "with mock logger" do
+    before do
+      @old_logger = Sidekiq.logger
+      @str_logger = StringIO.new
+      Sidekiq.logger = Logger.new(@str_logger)
+    end
+
+    after do
+      Sidekiq.logger = @old_logger
+    end
+
+    it "logs the exception to Sidekiq.logger" do
+      Component.new.invoke_exception(:a => 1)
+      @str_logger.rewind
+      log = @str_logger.readlines
+      assert_match /a=>1/, log[0], "didn't include the context"
+      assert_match /Something didn't work!/, log[1], "didn't include the exception message"
+      assert_match /test\/test_exception_handler.rb/, log[2], "didn't include the backtrace"
+    end
+  end
+
+  describe "with fake Airbrake" do
+    before do
+      ::Airbrake = MiniTest::Mock.new
+    end
+
+    after do
+      Object.send(:remove_const, "Airbrake") # HACK should probably inject Airbrake etc into this class in the future
+    end
+
+    it "notifies Airbrake" do
+      ::Airbrake.expect(:notify,nil,[TEST_EXCEPTION,:parameters => { :a => 1 }])
+      Component.new.invoke_exception(:a => 1)
+      ::Airbrake.verify
+    end
+  end
+
+  describe "with fake ExceptionNotifier" do
+    before do
+      ::ExceptionNotifier = Module.new
+      ::ExceptionNotifier::Notifier = MiniTest::Mock.new
+    end
+
+    after do
+      Object.send(:remove_const, "ExceptionNotifier")
+    end
+
+    it "notifies ExceptionNotifier" do
+      ::ExceptionNotifier::Notifier.expect(:background_exception_notification,nil,[TEST_EXCEPTION, :data => { :message => { :b => 2 } }])
+      Component.new.invoke_exception(:b => 2)
+      ::ExceptionNotifier::Notifier.verify
+    end
+  end
+
+  describe "with fake Exceptional" do
+    before do
+      ::Exceptional = Class.new do
+
+        def self.context(msg)
+          @msg = msg
+        end
+
+        def self.check_context
+          @msg
+        end
+      end
+
+      ::Exceptional::Config = MiniTest::Mock.new
+      ::Exceptional::Remote = MiniTest::Mock.new
+      ::Exceptional::ExceptionData = MiniTest::Mock.new
+    end
+
+    after do
+      Object.send(:remove_const, "Exceptional")
+    end
+
+    it "notifies Exceptional" do
+      ::Exceptional::Config.expect(:should_send_to_api?,true)
+      exception_data = MiniTest::Mock.new
+      ::Exceptional::Remote.expect(:error,nil,[exception_data])
+      ::Exceptional::ExceptionData.expect(:new,exception_data,[TEST_EXCEPTION])
+      Component.new.invoke_exception(:c => 3)
+      assert_equal({:c => 3},::Exceptional.check_context,"did not record arguments properly")
+      ::Exceptional::Config.verify
+      ::Exceptional::Remote.verify
+      ::Exceptional::ExceptionData.verify
+    end
+  end
+end

data/test/test_fetch.rb

@@ -0,0 +1,13 @@
+require 'helper'
+require 'sidekiq/fetch'
+
+class TestFetcher < MiniTest::Unit::TestCase
+  describe 'Fetcher#queues_cmd' do
+    describe 'when queues are strictly ordered' do
+      it 'returns the unique ordered queues properly based on priority and order they were passed in' do
+        fetcher = Sidekiq::Fetcher.new nil, %w[high medium low default], true
+        assert_equal (%w[queue:high queue:medium queue:low queue:default] << 1), fetcher._send_(:queues_cmd)
+      end
+    end
+  end
+end

data/test/test_middleware.rb

@@ -9,18 +9,6 @@ class TestMiddleware < MiniTest::Unit::TestCase
       Sidekiq.redis = REDIS
     end
 
-    it 'handles errors' do
-      handler = Sidekiq::Middleware::Server::ExceptionHandler.new
-
-      assert_raises ArgumentError do
-        handler.call('', { :a => 1 }, 'default') do
-          raise ArgumentError
-        end
-      end
-      assert_equal 1, $errors.size
-      assert_equal({ :a => 1 }, $errors[0][:parameters])
-    end
-
     class CustomMiddleware
       def initialize(name, recorder)
         @name = name
@@ -83,10 +71,3 @@ class TestMiddleware < MiniTest::Unit::TestCase
     end
   end
 end
-
-class FakeAirbrake
-  def self.notify(ex, hash)
-    $errors << hash
-  end
-end
-Airbrake = FakeAirbrake

data/test/test_processor.rb

@@ -2,11 +2,14 @@ require 'helper'
 require 'sidekiq/processor'
 
 class TestProcessor < MiniTest::Unit::TestCase
+  TestException = Class.new(StandardError)
+  TEST_EXCEPTION = TestException.new("kerboom!")
+
   describe 'with mock setup' do
     before do
       $invokes = 0
-      $errors = []
       @boss = MiniTest::Mock.new
+      @processor = ::Sidekiq::Processor.new(@boss)
       Celluloid.logger = nil
       Sidekiq.redis = REDIS
     end
@@ -14,19 +17,51 @@ class TestProcessor < MiniTest::Unit::TestCase
     class MockWorker
       include Sidekiq::Worker
       def perform(args)
-        raise "kerboom!" if args == 'boom'
+        raise TEST_EXCEPTION if args == 'boom'
+        args.pop if args.is_a? Array
         $invokes += 1
       end
     end
 
     it 'processes as expected' do
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
-      processor = ::Sidekiq::Processor.new(@boss)
-      @boss.expect(:processor_done!, nil, [processor])
-      processor.process(msg, 'default')
+      @boss.expect(:processor_done!, nil, [@processor])
+      @processor.process(msg, 'default')
       @boss.verify
       assert_equal 1, $invokes
-      assert_equal 0, $errors.size
+    end
+
+    it 'passes exceptions to ExceptionHandler' do
+      msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
+      begin
+        @processor.process(msg, 'default')
+        flunk "Expected #process to raise exception"
+      rescue TestException
+      end
+
+      assert_equal 0, $invokes
+    end
+
+    it 're-raises exceptions after handling' do
+      msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
+      re_raise = false
+
+      begin
+        @processor.process(msg, 'default')
+      rescue TestException
+        re_raise = true
+      end
+
+      assert re_raise, "does not re-raise exceptions after handling"
+    end
+
+    it 'does not modify original arguments' do
+      msg = { 'class' => MockWorker.to_s, 'args' => [['myarg']] }
+      msgstr = Sidekiq.dump_json(msg)
+      processor = ::Sidekiq::Processor.new(@boss)
+      @boss.expect(:processor_done!, nil, [processor])
+      processor.process(msgstr, 'default')
+      assert_equal [['myarg']], msg['args']
     end
   end
 end

data/test/test_web.rb

@@ -31,6 +31,14 @@ class TestWeb < MiniTest::Unit::TestCase
       refute_match /default/, last_response.body
     end
 
+    it 'can display poll' do
+      get '/poll'
+      assert_equal 200, last_response.status
+      assert_match /hero-unit/, last_response.body
+      assert_match /workers/, last_response.body
+      refute_match /navbar/, last_response.body
+    end
+
     it 'can display queues' do
       assert Sidekiq::Client.push('queue' => :foo, 'class' => WebWorker, 'args' => [1, 3])
 
@@ -115,26 +123,26 @@ class TestWeb < MiniTest::Unit::TestCase
       assert_equal 200, last_response.status
       assert_match /HardWorker/, last_response.body
     end
-    
+
     it 'can delete a single retry' do
       _, score = add_retry
 
       post "/retries/#{score}", 'delete' => 'Delete'
       assert_equal 302, last_response.status
       assert_equal 'http://example.org/retries', last_response.header['Location']
-      
+
       get "/retries"
       assert_equal 200, last_response.status
       refute_match /#{score}/, last_response.body
     end
-    
+
     it 'can retry a single retry now' do
       msg, score = add_retry
 
       post "/retries/#{score}", 'retry' => 'Retry'
       assert_equal 302, last_response.status
       assert_equal 'http://example.org/retries', last_response.header['Location']
-      
+
       get '/queues/default'
       assert_equal 200, last_response.status
       assert_match /#{msg['args'][2]}/, last_response.body

data/web/assets/javascripts/application.js

@@ -18,3 +18,32 @@ $(function() {
     }
   });
 });
+
+$(function() {
+  $('a[name=poll]').data('polling', false);
+
+  $('a[name=poll]').on('click', function(e) {
+    e.preventDefault();
+    var pollLink = $(this);
+    if (pollLink.data('polling')) {
+      clearInterval(pollLink.data('interval'));
+      pollLink.text('Live Poll');
+      $('.poll-status').text('');
+    }
+    else {
+      var href = pollLink.attr('href');
+      pollLink.data('interval', setInterval(function() {
+        $.get(href, function(data) {
+          var responseHtml = $(data);
+          $('.hero-unit').replaceWith(responseHtml.find('.hero-unit'));
+          $('.workers').replaceWith(responseHtml.find('.workers'));
+        });
+        var currentTime = new Date();
+        $('.poll-status').text('Last polled at: ' + currentTime.getHours() + ':' + currentTime.getMinutes() + ':' + currentTime.getSeconds());
+      }, 2000));
+      $('.poll-status').text('Starting to poll...');
+      pollLink.text('Stop Polling');
+    }
+    pollLink.data('polling', !pollLink.data('polling'));
+  })
+});

data/web/assets/stylesheets/layout.css

@@ -20,3 +20,7 @@ code {
 .hero-unit {
   padding: 30px;
 }
+
+.poll-status {
+  padding-left: 10px;
+}

data/web/views/_summary.slim

@@ -0,0 +1,8 @@
+.hero-unit
+  h1 Sidekiq is #{current_status}
+  p Processed: #{processed}
+  p Failed: #{failed}
+  p Busy Workers: #{workers.size}
+  p Scheduled: #{zcard('schedule')}
+  p Retries Pending: #{zcard('retry')}
+  p Queue Backlog: #{backlog}

data/web/views/_workers.slim

@@ -0,0 +1,14 @@
+table class="table table-striped table-bordered workers"
+  tr
+    th Worker
+    th Queue
+    th Class
+    th Arguments
+    th Started
+  - workers.each do |(worker, msg)|
+    tr
+      td= worker
+      td= msg['queue']
+      td= msg['payload']['class']
+      td= msg['payload']['args'].inspect[0..100]
+      td== relative_time(Time.parse(msg['run_at']))

data/web/views/index.slim

@@ -1,25 +1,10 @@
-.hero-unit
-  h1 Sidekiq is #{current_status}
-  p Processed: #{processed}
-  p Failed: #{failed}
-  p Busy Workers: #{workers.size}
-  p Scheduled: #{zcard('schedule')}
-  p Retries Pending: #{zcard('retry')}
-  p Queue Backlog: #{backlog}
+== slim :_summary
+
+.poll
+  a*{name: 'poll'} href='#{{root_path}}poll' Live Poll
+  span class="poll-status"
+
+== slim :_workers
 
-table class="table table-striped table-bordered"
-  tr
-    th Worker
-    th Queue
-    th Class
-    th Arguments
-    th Started
-  - workers.each do |(worker, msg)|
-    tr
-      td= worker
-      td= msg['queue']
-      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" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list
+  button.btn type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list

data/web/views/layout.slim

@@ -13,7 +13,7 @@ html
             span.icon-bar
           a.brand href='#{{root_path}}'
             | Sidekiq
-          div.nav-collapse  
+          div.nav-collapse
             ul.nav
               li
                 a href='#{{root_path}}' Home

data/web/views/poll.slim

@@ -0,0 +1,3 @@
+div
+  == slim :_summary
+  == slim :_workers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -226,6 +226,7 @@ files:
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
 - lib/sidekiq/core_ext.rb
+- lib/sidekiq/exception_handler.rb
 - lib/sidekiq/extensions/action_mailer.rb
 - lib/sidekiq/extensions/active_record.rb
 - lib/sidekiq/extensions/generic_proxy.rb
@@ -234,7 +235,6 @@ files:
 - lib/sidekiq/manager.rb
 - lib/sidekiq/middleware/chain.rb
 - lib/sidekiq/middleware/server/active_record.rb
-- lib/sidekiq/middleware/server/exception_handler.rb
 - lib/sidekiq/middleware/server/logging.rb
 - lib/sidekiq/middleware/server/retry_jobs.rb
 - lib/sidekiq/middleware/server/timeout.rb
@@ -295,8 +295,9 @@ files:
 - test/helper.rb
 - test/test_cli.rb
 - test/test_client.rb
+- test/test_exception_handler.rb
 - test/test_extensions.rb
-- test/test_manager.rb
+- test/test_fetch.rb
 - test/test_middleware.rb
 - test/test_processor.rb
 - test/test_retry.rb
@@ -328,8 +329,11 @@ files:
 - web/assets/stylesheets/vendor/bootstrap-responsive.css
 - web/assets/stylesheets/vendor/bootstrap.css
 - web/views/_paging.slim
+- web/views/_summary.slim
+- web/views/_workers.slim
 - web/views/index.slim
 - web/views/layout.slim
+- web/views/poll.slim
 - web/views/queue.slim
 - web/views/queues.slim
 - web/views/retries.slim
@@ -366,8 +370,9 @@ test_files:
 - test/helper.rb
 - test/test_cli.rb
 - test/test_client.rb
+- test/test_exception_handler.rb
 - test/test_extensions.rb
-- test/test_manager.rb
+- test/test_fetch.rb
 - test/test_middleware.rb
 - test/test_processor.rb
 - test/test_retry.rb

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

@@ -1,38 +0,0 @@
-require 'sidekiq/util'
-
-module Sidekiq
-  module Middleware
-    module Server
-      class ExceptionHandler
-        include Util
-        def call(*args)
-          yield
-        rescue => ex
-          logger.warn ex
-          logger.warn ex.backtrace.join("\n")
-          send_to_airbrake(args[1], ex) if defined?(::Airbrake)
-          send_to_exceptional(args[1], ex) if defined?(::Exceptional)
-          send_to_exception_notifier(args[1], ex) if defined?(::ExceptionNotifier)
-          raise
-        end
-
-        private
-
-        def send_to_airbrake(msg, ex)
-          ::Airbrake.notify(ex, :parameters => msg)
-        end
-
-        def send_to_exceptional(msg, ex)
-          if ::Exceptional::Config.should_send_to_api?
-            ::Exceptional.context(msg)
-            ::Exceptional::Remote.error(::Exceptional::ExceptionData.new(ex))
-          end
-        end
-
-        def send_to_exception_notifier(msg, ex)
-          ::ExceptionNotifier::Notifier.background_exception_notification(ex, :data => { :message => msg })
-        end
-      end
-    end
-  end
-end

data/test/test_manager.rb

@@ -1,51 +0,0 @@
-require 'helper'
-require 'sidekiq'
-require 'sidekiq/manager'
-
-# for TimedQueue
-require 'connection_pool'
-
-class TestManager < MiniTest::Unit::TestCase
-  describe 'with redis' do
-    before do
-      Sidekiq.redis = REDIS
-      Sidekiq.redis {|c| c.flushdb }
-      $processed = 0
-      $mutex = Mutex.new
-    end
-
-    class IntegrationWorker
-      include Sidekiq::Worker
-      sidekiq_options :queue => 'foo'
-
-      def perform(a, b)
-        $mutex.synchronize do
-          $processed += 1
-        end
-        a + b
-      end
-    end
-
-    it 'processes messages' do
-      IntegrationWorker.perform_async(1, 2)
-      IntegrationWorker.perform_async(1, 3)
-
-      q = TimedQueue.new
-      mgr = Sidekiq::Manager.new(:queues => [:foo], :concurrency => 2)
-      mgr.when_done do |_|
-        q << 'done' if $processed == 2
-      end
-      mgr.start!
-      result = q.timed_pop(1.0)
-      assert_equal 'done', result
-      mgr.stop
-      mgr.terminate
-
-      # Gross bloody hack because I can't get the actor threads
-      # to shut down cleanly in the test.  Need @bascule's help here.
-      (Thread.list - [Thread.current]).each do |t|
-        t.raise Interrupt
-      end
-    end
-  end
-end