sidekiq 2.0.3 → 2.1.0

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+branches:
+  only:
+    - master
+notifications:
+  irc: "irc.freenode.org#sidekiq"
+  email:
+    recipients:
+      - sidekiq@librelist.org
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode

data/Changes.md

@@ -1,12 +1,23 @@
+2.1.0
+-----------
+
+- Tune Celluloid to no longer run message processing within a Fiber.
+  This gives us a full Thread stack and also lowers Sidekiq's memory
+  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]
+
 2.0.3
 -----------
-- Fix sidekiq-web's navbar on mobile devices and windows <= 980px (ezkl)
+- Fix sidekiq-web's navbar on mobile devices and windows under 980px (ezkl)
 - Fix Capistrano task for first deploys [#259]
 - Worker subclasses now properly inherit sidekiq\_options set in
   their superclass [#221]
 - Add random jitter to scheduler to spread polls across POLL\_INTERVAL
   window. [#247]
-- Add note in README about new mailing list: sidekiq@librelist.org
+- Sidekiq has a new mailing list: sidekiq@librelist.org  See README.
 
 2.0.2
 -----------

data/Gemfile

@@ -1,10 +1,11 @@
 source 'http://rubygems.org'
 gemspec
 
+gem 'celluloid'
 gem 'slim'
 gem 'sprockets'
 gem 'sass'
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.6'
 gem 'sqlite3'
 
 group :test do

data/README.md

@@ -1,4 +1,4 @@
-Sidekiq
+Sidekiq [![Build Status](https://secure.travis-ci.org/mperham/sidekiq.png)](http://travis-ci.org/mperham/sidekiq)
 ==============
 
 Simple, efficient message processing for Ruby.
@@ -31,7 +31,7 @@ untested but I will do my best to support them.  Ruby 1.8 is not supported.
 Installation
 -----------------
 
-   gem install sidekiq
+    gem install sidekiq
 
 
 Getting Started

data/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.erb

@@ -42,47 +42,10 @@ signal_worker() {
   if [ -f $PID_FILE ]; then
     set_pid_from_file
     logger -t "monit-sidekiq[$$]" "Issuing kill with -$SIG $PID"
-    SLEEP_COUNT=0
     kill -$SIG $PID 
   fi
 }
 
-signal_worker_fatally(){
-  signal_worker() 
-  if [ -f $PID_FILE ]; then
-    if [ -n "$ALLOW_TIMEOUT" ]; then
-      while [ -e /proc/$PID ]; do
-        sleep .25
-        let "SLEEP_COUNT+=1"
-        let "REPORT_TIME = $SLEEP_COUNT%4"
-        if(( "$SLEEP_COUNT" > $GRACE_TIME )); then
-          logger -t "monit-sidekiq[$$]" "Sidekiq worker with pid $PID for $WORKER_REF still running, issuing -TERM"
-          kill -15 $PID 2>/dev/null; true
-        elif(( $REPORT_TIME == 0 )); then
-          let "RUNTIME = $SLEEP_COUNT/4"
-          logger -t "monit-sidekiq[$$]" "waiting for $PID to die ( for $RUNTIME seconds now)"
-        fi 
-      done
-    fi
-    sleep 1
-    if [ -d /proc/$PID ];then 
-      for child in $(ps axo pid,ppid | awk "{ if ( \$2 == $PID ) { print \$1 }}");
-      do
-        kill -9 $child 2>/dev/null; true
-        logger -t "monit-sidekiq[$$]" "Murdering Sidekiq workers child with $child for $WORKER_REF"
-        break
-      done    
-      while [ -d /proc/$PID ]; do
-        logger -t "monit-sidekiq[$$]" "Murdering Sidekiq worker with $PID for $WORKER_REF"
-        kill -9 $PID
-        sleep 1
-      done
-    fi
-    logger -t "monit-sidekiq[$$]" "Removing pid file for $PID - $WORKER_REF"
-    [ -e "$PID_FILE" -a ! -d /proc/$PID ] && rm -f $PID_FILE
-  fi
-}
-
 lock(){
   RESULT=0
   if [ -e $LOCK_FILE ]; then
@@ -146,14 +109,14 @@ else
   exit 1
 fi
 
-WORKER_REF=`echo $CONF_FILE | sed s/.conf//`
+WORKER_REF=`echo $CONF_FILE | sed s/.yml//`
 LOG_FILE="$APP_ROOT/log/$WORKER_REF.log"
 LOCK_FILE="/tmp/$WORKER_REF.monit-lock"
 PID_FILE="/var/run/engineyard/sidekiq/$APP/$WORKER_REF.pid"
 GEMFILE="$APP_ROOT/Gemfile"
 SIDEKIQ="sidekiq"
 if [ -f $GEMFILE ];then
-  SIDEKIQ="bundle exec $APP_ROOT/ey_bundler_binstubs/sidekiq"
+  SIDEKIQ="$APP_ROOT/ey_bundler_binstubs/sidekiq"
 fi
 
 if [ -d $APP_ROOT ]; then
@@ -201,8 +164,6 @@ if [ -d $APP_ROOT ]; then
       legacy_fix
       lock
       SIG="INT"
-      [ -z "$GRACE_TIME" ] && GRACE_TIME=60
-      ALLOW_TIMEOUT=1
       signal_worker
       [ -e "$LOCK_FILE" ] && rm $LOCK_FILE
       unlock_and_exit_cleanly  

data/lib/sidekiq.rb

@@ -97,4 +97,12 @@ module Sidekiq
     Sidekiq::Logging.logger
   end
 
+  def self.logger=(log)
+    Sidekiq::Logging.logger = log
+  end
+
+  def self.poll_interval=(interval)
+    self.options[:poll_interval] = interval
+  end
+
 end

data/lib/sidekiq/cli.rb

@@ -17,8 +17,8 @@ end
 
 trap 'TTIN' do
   Thread.list.each do |thread|
-    puts "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}"
-    puts thread.backtrace.join("\n")
+    Sidekiq.logger.info "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}"
+    Sidekiq.logger.info thread.backtrace.join("\n")
   end
 end
 

data/lib/sidekiq/client.rb

@@ -1,5 +1,4 @@
 require 'sidekiq/middleware/chain'
-require 'sidekiq/middleware/client/unique_jobs'
 
 module Sidekiq
   class Client
@@ -49,7 +48,7 @@ module Sidekiq
         payload = Sidekiq.dump_json(item)
         Sidekiq.redis do |conn|
           if item['at']
-            pushed = (conn.zadd('schedule', item['at'].to_s, payload) == 1)
+            pushed = conn.zadd('schedule', item['at'].to_s, payload)
           else
             _, pushed = conn.multi do
               conn.sadd('queues', queue)

data/lib/sidekiq/extensions/generic_proxy.rb

@@ -1,6 +1,6 @@
 module Sidekiq
   module Extensions
-    class Proxy < (RUBY_VERSION < '1.9' ? Object : BasicObject)
+    class Proxy < BasicObject
       def initialize(performable, target, at=nil)
         @performable = performable
         @target = target

data/lib/sidekiq/manager.rb

@@ -110,7 +110,7 @@ module Sidekiq
           processor = @ready.pop
           @in_progress[processor.object_id] = [msg, queue]
           @busy << processor
-          processor.process!(Sidekiq.load_json(msg), queue)
+          processor.process!(msg, queue)
         end
       end
     end

data/lib/sidekiq/middleware/chain.rb

@@ -7,22 +7,26 @@ module Sidekiq
   #
   # To add middleware for the client:
   #
-  # Sidekiq.client_middleware do |chain|
-  #   chain.add MyClientHook
+  # Sidekiq.configure_client do |config|
+  #   config.client_middleware do |chain|
+  #     chain.add MyClientHook
+  #   end
   # end
   #
   # To modify middleware for the server, just call
   # with another block:
   #
-  # Sidekiq.server_middleware do |chain|
-  #   chain.add MyServerHook
-  #   chain.remove ActiveRecord
+  # Sidekiq.configure_server do |config|
+  #   config.server_middleware do |chain|
+  #     chain.add MyServerHook
+  #     chain.remove ActiveRecord
+  #   end
   # end
   #
   # This is an example of a minimal server middleware:
   #
   # class MyServerHook
-  #   def call(worker, msg, queue)
+  #   def call(worker_instance, msg, queue)
   #     puts "Before work"
   #     yield
   #     puts "After work"
@@ -32,7 +36,7 @@ module Sidekiq
   # This is an example of a minimal client middleware:
   #
   # class MyClientHook
-  #   def call(msg, queue)
+  #   def call(worker_class, msg, queue)
   #     puts "Before push"
   #     yield
   #     puts "After push"

data/lib/sidekiq/paginator.rb

@@ -0,0 +1,31 @@
+module Sidekiq
+  module Paginator
+    def page(key, pageidx=1, page_size=25)
+      current_page = pageidx.to_i < 1 ? 1 : pageidx.to_i
+      pageidx = current_page - 1
+      total_size = 0
+      items = []
+      starting = pageidx * page_size
+      ending = starting + page_size - 1
+
+      Sidekiq.redis do |conn|
+        type = conn.type(key)
+
+        case type
+        when 'zset'
+          total_size = conn.zcard(key)
+          items = conn.zrange(key, starting, ending, :with_scores => true)
+        when 'list'
+          total_size = conn.llen(key)
+          items = conn.lrange(key, starting, ending)
+        when 'none'
+          return [1, 0, []]
+        else
+          raise "can't page a #{type}"
+        end
+      end
+
+      [current_page, total_size, items]
+    end
+  end
+end

data/lib/sidekiq/processor.rb

@@ -16,6 +16,8 @@ module Sidekiq
     include Util
     include Celluloid
 
+    exclusive :process
+
     def self.default_middleware
       Middleware::Chain.new do |m|
         m.add Middleware::Server::ExceptionHandler
@@ -30,19 +32,14 @@ module Sidekiq
       @boss = boss
     end
 
-    def process(msg, queue)
+    def process(msgstr, queue)
+      msg = Sidekiq.load_json(msgstr)
       klass  = constantize(msg['class'])
       worker = klass.new
 
-      # Celluloid actor calls are performed within a Fiber.
-      # This would give us a terribly small 4KB stack on MRI
-      # so we use Celluloid's defer to run things in a thread pool
-      # in order to get a full-sized stack for the Worker.
-      defer do
-        stats(worker, msg, queue) do
-          Sidekiq.server_middleware.invoke(worker, msg, queue) do
-            worker.perform(*msg['args'])
-          end
+      stats(worker, msg, queue) do
+        Sidekiq.server_middleware.invoke(worker, msg, queue) do
+          worker.perform(*msg['args'])
         end
       end
       @boss.processor_done!(current_actor)

data/lib/sidekiq/redis_connection.rb

@@ -6,16 +6,17 @@ module Sidekiq
   class RedisConnection
     def self.create(options={})
       url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0'
+      driver = options[:driver] || 'ruby'
       # need a connection for Fetcher and Retry
       size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 2) : 5)
 
       ConnectionPool.new(:timeout => 1, :size => size) do
-        build_client(url, options[:namespace])
+        build_client(url, options[:namespace], driver)
       end
     end
 
-    def self.build_client(url, namespace)
-      client = Redis.connect(:url => url)
+    def self.build_client(url, namespace, driver)
+      client = Redis.connect(:url => url, :driver => driver)
       if namespace
         Redis::Namespace.new(namespace, :redis => client)
       else

data/lib/sidekiq/scheduled.rb

@@ -35,20 +35,27 @@ module Sidekiq
               messages.each do |message|
                 logger.debug { "enqueued #{sorted_set}: #{message}" }
                 msg = Sidekiq.load_json(message)
-                conn.rpush("queue:#{msg['queue']}", message)
+                conn.multi do
+                  conn.sadd('queues', msg['queue'])
+                  conn.rpush("queue:#{msg['queue']}", message)
+                end
               end
             end
           end
 
-          after(POLL_INTERVAL) { poll }
+          after(poll_interval) { poll }
         end
       end
 
       private
 
+      def poll_interval
+        Sidekiq.options[:poll_interval] || POLL_INTERVAL
+      end
+
       def add_jitter
         begin
-          sleep(POLL_INTERVAL * rand)
+          sleep(poll_interval * rand)
         rescue Celluloid::Task::TerminatedError
           # Hit Ctrl-C when Sidekiq is finished booting and we have a chance
           # to get here.

data/lib/sidekiq/testing.rb

@@ -24,22 +24,12 @@ module Sidekiq
     #   assert_equal 1, Sidekiq::Extensions::DelayedMailer.jobs.size
     #
     module ClassMethods
-      alias_method :perform_async_old, :perform_async
-      def perform_async(*args)
-        jobs << { 'class' => self.name, 'args' => args }
+      alias_method :client_push_old, :client_push
+      def client_push(opts)
+        jobs << opts
         true
       end
 
-      alias_method :perform_in_old, :perform_in
-      alias_method :perform_at_old, :perform_at
-      def perform_in(interval, *args)
-        int = interval.to_f
-        ts = (int < 1_000_000_000 ? Time.now.to_f + int : int)
-        jobs << { 'class' => self.name, 'args' => args, 'at' => ts }
-        true
-      end
-      alias_method :perform_at, :perform_in
-
       def jobs
         @pushed ||= []
       end

data/lib/sidekiq/version.rb

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

data/lib/sidekiq/web.rb

@@ -1,6 +1,8 @@
 require 'sinatra/base'
 require 'slim'
 require 'sprockets'
+require 'sidekiq/paginator'
+
 module Sidekiq
   class SprocketsMiddleware
     def initialize(app, options={})
@@ -28,6 +30,8 @@ module Sidekiq
   end
 
   class Web < Sinatra::Base
+    include Sidekiq::Paginator
+
     dir = File.expand_path(File.dirname(__FILE__) + "/../../web")
     set :views,  "#{dir}/views"
     set :root, "#{dir}/public"
@@ -68,21 +72,6 @@ module Sidekiq
         Sidekiq.redis { |conn| conn.zcard(name) }
       end
 
-      def retries(count=50)
-        zcontents('retry', count)
-      end
-
-      def scheduled(count=50)
-        zcontents('schedule', count)
-      end
-
-      def zcontents(name, count)
-        Sidekiq.redis do |conn|
-          results = conn.zrange(name, 0, count, :withscores => true)
-          results.map { |msg, score| [Sidekiq.load_json(msg), score] }
-        end
-      end
-
       def queues
         @queues ||= Sidekiq.redis do |conn|
           conn.smembers('queues').map do |q|
@@ -135,9 +124,10 @@ module Sidekiq
 
     get "/queues/:name" do
       halt 404 unless params[:name]
-      count = (params[:count] || 10).to_i
+      @count = (params[:count] || 25).to_i
       @name = params[:name]
-      @messages = Sidekiq.redis {|conn| conn.lrange("queue:#{@name}", 0, count) }.map { |str| Sidekiq.load_json(str) }
+      (@current_page, @total_size, @messages) = page("queue:#{@name}", params[:page], @count)
+      @messages = @messages.map {|msg| Sidekiq.load_json(msg) }
       slim :queue
     end
 
@@ -163,12 +153,16 @@ module Sidekiq
     end
 
     get '/retries' do
-      @retries = retries
+      @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] }
       slim :retries
     end
 
     get '/scheduled' do
-      @scheduled = scheduled
+      @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] }
       slim :scheduled
     end
 

data/lib/sidekiq/worker.rb

@@ -32,13 +32,13 @@ module Sidekiq
 
     module ClassMethods
       def perform_async(*args)
-        Sidekiq::Client.push('class' => self, 'args' => args)
+        client_push('class' => self, 'args' => args)
       end
 
       def perform_in(interval, *args)
         int = interval.to_f
         ts = (int < 1_000_000_000 ? Time.now.to_f + int : int)
-        Sidekiq::Client.push('class' => self, 'args' => args, 'at' => ts)
+        client_push('class' => self, 'args' => args, 'at' => ts)
       end
       alias_method :perform_at, :perform_in
 
@@ -46,7 +46,6 @@ module Sidekiq
       # Allows customization for this type of Worker.
       # Legal options:
       #
-      #   :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*
@@ -56,7 +55,7 @@ module Sidekiq
         self.sidekiq_options_hash = get_sidekiq_options.merge(stringify_keys(opts || {}))
       end
 
-      DEFAULT_OPTIONS = { 'unique' => true, 'retry' => true, 'queue' => 'default' }
+      DEFAULT_OPTIONS = { 'retry' => true, 'queue' => 'default' }
 
       def get_sidekiq_options # :nodoc:
         self.sidekiq_options_hash ||= DEFAULT_OPTIONS
@@ -68,6 +67,11 @@ module Sidekiq
         end
         hash
       end
+
+      def client_push(*args) # :nodoc:
+        Sidekiq::Client.push(*args)
+      end
+
     end
   end
 end

data/myapp/Gemfile

@@ -9,7 +9,7 @@ platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
-gem 'rails', '3.2.2'
+gem 'rails', '3.2.6'
 gem 'sidekiq', :path => '..'
 gem 'capistrano'
 

data/sidekiq.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Sidekiq::VERSION
   gem.add_dependency                  'redis', '~> 3'
   gem.add_dependency                  'redis-namespace'
-  gem.add_dependency                  'connection_pool', '~> 0.9.0'
-  gem.add_dependency                  'celluloid', '~> 0.11.0'
+  gem.add_dependency                  'connection_pool', '~> 0.9.2'
+  gem.add_dependency                  'celluloid', '~> 0.11.1'
   gem.add_dependency                  'multi_json', '~> 1'
   gem.add_development_dependency      'minitest', '~> 3'
   gem.add_development_dependency      'sinatra'

data/test/test_client.rb

@@ -3,36 +3,6 @@ require 'sidekiq/client'
 require 'sidekiq/worker'
 
 class TestClient < MiniTest::Unit::TestCase
-  describe 'with real redis' do
-    before do
-      Sidekiq.redis = REDIS
-      Sidekiq.redis {|c| c.flushdb }
-    end
-
-    class QueueWorker
-      include Sidekiq::Worker
-      sidekiq_options :queue => 'customqueue'
-    end
-
-    it 'does not push duplicate messages when configured for unique only' do
-      Sidekiq.client_middleware do |chain|
-        chain.add Sidekiq::Middleware::Client::UniqueJobs
-      end
-      QueueWorker.sidekiq_options :unique => true
-      10.times { Sidekiq::Client.push('class' => QueueWorker, 'args' => [1, 2]) }
-      assert_equal 1, Sidekiq.redis {|c| c.llen("queue:customqueue") }
-    end
-
-    it 'does push duplicate messages when not configured for unique only' do
-      Sidekiq.client_middleware do |chain|
-        chain.add Sidekiq::Middleware::Client::UniqueJobs
-      end
-      QueueWorker.sidekiq_options :unique => false
-      10.times { Sidekiq::Client.push('class' => QueueWorker, 'args' => [1, 2]) }
-      assert_equal 10, Sidekiq.redis {|c| c.llen("queue:customqueue") }
-    end
-  end
-
   describe 'with mock redis' do
     before do
       @redis = MiniTest::Mock.new

data/test/test_middleware.rb

@@ -1,6 +1,5 @@
 require 'helper'
 require 'sidekiq/middleware/chain'
-require 'sidekiq/middleware/server/unique_jobs'
 require 'sidekiq/processor'
 
 class TestMiddleware < MiniTest::Unit::TestCase
@@ -43,9 +42,10 @@ class TestMiddleware < MiniTest::Unit::TestCase
     end
 
     class CustomWorker
+      $recorder = []
       include Sidekiq::Worker
       def perform(recorder)
-        recorder << ['work_performed']
+        $recorder << ['work_performed']
       end
     end
 
@@ -56,18 +56,18 @@ class TestMiddleware < MiniTest::Unit::TestCase
 
     it 'executes middleware in the proper order' do
       recorder = []
-      msg = { 'class' => CustomWorker.to_s, 'args' => [recorder] }
+      msg = Sidekiq.dump_json({ 'class' => CustomWorker.to_s, 'args' => [$recorder] })
 
       Sidekiq.server_middleware do |chain|
         # should only add once, second should be ignored
-        2.times { |i| chain.add CustomMiddleware, i.to_s, recorder }
+        2.times { |i| chain.add CustomMiddleware, i.to_s, $recorder }
       end
 
       boss = MiniTest::Mock.new
       processor = Sidekiq::Processor.new(boss)
       boss.expect(:processor_done!, nil, [processor])
       processor.process(msg, 'default')
-      assert_equal %w(0 before work_performed 0 after), recorder.flatten
+      assert_equal %w(0 before work_performed 0 after), $recorder.flatten
     end
 
     it 'allows middleware to abruptly stop processing rest of chain' do

data/test/test_processor.rb

@@ -20,7 +20,7 @@ class TestProcessor < MiniTest::Unit::TestCase
     end
 
     it 'processes as expected' do
-      msg = { 'class' => MockWorker.to_s, 'args' => ['myarg'] }
+      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')

data/test/test_retry.rb

@@ -113,7 +113,8 @@ class TestRetry < MiniTest::Unit::TestCase
       fake_msg = Sidekiq.dump_json({ 'class' => 'Bob', 'args' => [1,2], 'queue' => 'someq' })
       @redis.expect :multi, [[fake_msg], 1], []
       @redis.expect :multi, [[], nil], []
-      @redis.expect :rpush, 1, ['queue:someq', fake_msg]
+      @redis.expect :multi, [[], nil], []
+      @redis.expect :multi, [[], nil], []
 
       inst = Sidekiq::Scheduled::Poller.new
       inst.poll

data/test/test_scheduling.rb

@@ -18,13 +18,13 @@ class TestScheduling < MiniTest::Unit::TestCase
     end
 
     it 'schedules a job via interval' do
-      @redis.expect :zadd, 1, ['schedule', String, String]
+      @redis.expect :zadd, true, ['schedule', String, String]
       assert_equal true, ScheduledWorker.perform_in(600, 'mike')
       @redis.verify
     end
 
     it 'schedules a job via timestamp' do
-      @redis.expect :zadd, 1, ['schedule', String, String]
+      @redis.expect :zadd, true, ['schedule', String, String]
       assert_equal true, ScheduledWorker.perform_in(5.days.from_now, 'mike')
       @redis.verify
     end

data/test/test_stats.rb

@@ -18,7 +18,7 @@ class TestStats < MiniTest::Unit::TestCase
     end
 
     it 'updates global stats in the success case' do
-      msg = { 'class' => DumbWorker.to_s, 'args' => [""] }
+      msg = Sidekiq.dump_json({ 'class' => DumbWorker.to_s, 'args' => [""] })
       boss = MiniTest::Mock.new
 
       @redis.with do |conn|
@@ -44,7 +44,7 @@ class TestStats < MiniTest::Unit::TestCase
     end
 
     it 'updates global stats in the error case' do
-      msg = { 'class' => DumbWorker.to_s, 'args' => [nil] }
+      msg = Sidekiq.dump_json({ 'class' => DumbWorker.to_s, 'args' => [nil] })
       boss = MiniTest::Mock.new
 
       @redis.with do |conn|

data/test/test_testing.rb

@@ -53,11 +53,9 @@ class TestTesting < MiniTest::Unit::TestCase
     after do
       # Undo override
       Sidekiq::Worker::ClassMethods.class_eval do
-        %w(async at in).each do |token|
-          remove_method :"perform_#{token}"
-          alias_method :"perform_#{token}", :"perform_#{token}_old"
-          remove_method :"perform_#{token}_old"
-        end
+        remove_method :client_push
+        alias_method :client_push, :client_push_old
+        remove_method :client_push_old
       end
     end
 

data/web/views/_paging.slim

@@ -0,0 +1,15 @@
+- if @total_size > @count
+  .pagination.pagination-right
+    ul
+      li class="#{'disabled' if @current_page == 1}"
+        a href="#{url}?page=1" «
+      - if @current_page > 1
+        li
+          a href="#{url}?page=#{@current_page - 1}" #{@current_page - 1}
+      li.disabled
+        a href="#{url}?page=#{@current_page}" #{@current_page}
+      - if @total_size > @current_page * @count
+        li
+          a href="#{url}?page=#{@current_page + 1}" #{@current_page + 1}
+      li class="#{'disabled' if @total_size <= @current_page * @count}"
+        a href="#{url}?page=#{(@total_size / @count).ceil + 1}" »

data/web/views/queue.slim

@@ -1,5 +1,7 @@
 header
-  h1 Latest messages in #{@name}
+  h1 Current messages in #{@name}
+
+== slim :_paging, :locals => { :url => "#{root_path}queues/#{@name}" }
 
 table class="table table-striped table-bordered"
   tr
@@ -9,3 +11,5 @@ table class="table table-striped table-bordered"
     tr
       td= msg['class']
       td= msg['args'].inspect[0..100]
+
+== slim :_paging, :locals => { :url => "#{root_path}queues/#{@name}" }

data/web/views/retries.slim

@@ -1,6 +1,8 @@
 h1 Retries
 
 - if @retries.size > 0
+  == slim :_paging, :locals => { :url => "#{root_path}retries" }
+
   form action="#{root_path}retries" method="post"
     table class="table table-striped table-bordered"
       tr

data/web/views/scheduled.slim

@@ -1,6 +1,8 @@
 h1 Scheduled Jobs
 
 - if @scheduled.size > 0
+  == slim :_paging, :locals => { :url => "#{root_path}scheduled" }
+
   form action="#{root_path}scheduled" method="post"
     table class="table table-striped table-bordered"
       tr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70268588228240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70268588228240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70268588227780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +37,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70268588227780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70268588227180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70268588227180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70268588226500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
-  version_requirements: *70268588226500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70268588225840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *70268588225840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70268588225120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70268588225120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70268588224740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268588224740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70268588224280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268588224280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70268588223740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268588223740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70268588223240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +165,15 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70268588223240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70268588222720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +181,12 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70268588222720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -143,6 +198,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - COMM-LICENSE
 - Changes.md
 - Gemfile
@@ -177,14 +233,12 @@ files:
 - lib/sidekiq/logging.rb
 - lib/sidekiq/manager.rb
 - lib/sidekiq/middleware/chain.rb
-- lib/sidekiq/middleware/client/unique_jobs.rb
 - lib/sidekiq/middleware/server/active_record.rb
 - lib/sidekiq/middleware/server/exception_handler.rb
-- 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/paginator.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
 - lib/sidekiq/redis_connection.rb
@@ -273,6 +327,7 @@ files:
 - web/assets/stylesheets/layout.css
 - web/assets/stylesheets/vendor/bootstrap-responsive.css
 - web/assets/stylesheets/vendor/bootstrap.css
+- web/views/_paging.slim
 - web/views/index.slim
 - web/views/layout.slim
 - web/views/queue.slim
@@ -301,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple, efficient message processing for Ruby

data/lib/sidekiq/middleware/client/unique_jobs.rb

@@ -1,35 +0,0 @@
-require 'digest'
-
-module Sidekiq
-  module Middleware
-    module Client
-      class UniqueJobs
-        HASH_KEY_EXPIRATION = 30 * 60
-
-        def call(worker_class, item, queue)
-          enabled = worker_class.get_sidekiq_options['unique']
-          if enabled
-            payload_hash = Digest::MD5.hexdigest(Sidekiq.dump_json(item))
-            unique = false
-
-            Sidekiq.redis do |conn|
-              conn.watch(payload_hash)
-
-              if conn.get(payload_hash)
-                conn.unwatch
-              else
-                unique = conn.multi do
-                  conn.setex(payload_hash, HASH_KEY_EXPIRATION, 1)
-                end
-              end
-            end
-            yield if unique
-          else
-            yield
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-module Sidekiq
-  module Middleware
-    module Server
-      class FailureJobs
-        def call(*args)
-          yield
-        rescue => e
-          data = {
-            :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S %Z"),
-            :payload => args[1],
-            :exception => e.class.to_s,
-            :error => e.to_s,
-            :backtrace => e.backtrace,
-            :worker => args[1]['class'],
-            :queue => args[2]
-          }
-          Sidekiq.redis {|conn| conn.rpush(:failed, Sidekiq.dump_json(data)) }
-          raise
-        end
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-module Sidekiq
-  module Middleware
-    module Server
-      class UniqueJobs
-        def call(*args)
-          yield
-        ensure
-          json = Sidekiq.dump_json(args[1])
-          hash = Digest::MD5.hexdigest(json)
-          Sidekiq.redis {|conn| conn.del(hash) }
-        end
-      end
-    end
-  end
-end