sidekiq 0.8.0 → 0.9.0

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

@@ -9,9 +9,9 @@ module Sidekiq
 
         def call(item, queue)
           payload_hash = Digest::MD5.hexdigest(MultiJson.encode(item))
-          Sidekiq.redis.with_connection do |redis|
-            return if redis.get(payload_hash)
-            redis.setex(payload_hash, HASH_KEY_EXPIRATION, 1)
+          Sidekiq.redis do |conn|
+            return if conn.get(payload_hash)
+            conn.setex(payload_hash, HASH_KEY_EXPIRATION, 1)
           end
 
           yield

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

@@ -15,7 +15,7 @@ module Sidekiq
             :queue => args[2]
           }
 
-          Sidekiq.redis.rpush(:failed, MultiJson.encode(data))
+          Sidekiq.redis {|conn| conn.rpush(:failed, MultiJson.encode(data)) }
           raise
         end
       end

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

@@ -5,7 +5,7 @@ module Sidekiq
         def call(*args)
           yield
         ensure
-          Sidekiq.redis.del(Digest::MD5.hexdigest(MultiJson.encode(args[1])))
+          Sidekiq.redis {|conn| conn.del(Digest::MD5.hexdigest(MultiJson.encode(args[1]))) }
         end
       end
     end

data/lib/sidekiq/processor.rb

@@ -25,11 +25,9 @@ module Sidekiq
       end
     end
 
-    attr_accessor :msg, :queue
-
     def initialize(boss)
       @boss = boss
-      redis.sadd('workers', self)
+      redis {|x| x.sadd('workers', self) }
     end
 
     def process(msg, queue)
@@ -55,7 +53,7 @@ module Sidekiq
     private
 
     def stats(worker, msg, queue)
-      redis.with_connection do |conn|
+      redis do |conn|
         conn.multi do
           conn.set("worker:#{self}:started", Time.now.to_s)
           conn.set("worker:#{self}", MultiJson.encode(:queue => queue, :payload => msg,
@@ -69,7 +67,7 @@ module Sidekiq
       rescue
         dying = true
         # Uh oh, error.  We will die so unregister as much as we can first.
-        redis.with_connection do |conn|
+        redis do |conn|
           conn.multi do
             conn.incrby("stat:failed", 1)
             conn.del("stat:processed:#{self}")
@@ -78,7 +76,7 @@ module Sidekiq
         end
         raise
       ensure
-        redis.with_connection do |conn|
+        redis do |conn|
           conn.multi do
             conn.del("worker:#{self}")
             conn.del("worker:#{self}:started")

data/lib/sidekiq/rails.rb

@@ -1,5 +1,20 @@
 module Sidekiq
+  def self.hook_rails!
+    if defined?(ActiveRecord)
+      ActiveRecord::Base.extend(Sidekiq::Extensions::ActiveRecord)
+      ActiveRecord::Base.send(:include, Sidekiq::Extensions::ActiveRecord)
+    end
+
+    if defined?(ActionMailer)
+      ActionMailer::Base.extend(Sidekiq::Extensions::ActionMailer)
+    end
+  end
+
   class Rails < ::Rails::Engine
     config.autoload_paths << File.expand_path("#{config.root}/app/workers") if File.exist?("#{config.root}/app/workers")
-  end
+
+    initializer 'sidekiq' do
+      Sidekiq.hook_rails!
+    end
+  end if defined?(::Rails)
 end

data/lib/sidekiq/redis_connection.rb

@@ -5,9 +5,9 @@ module Sidekiq
   class RedisConnection
     def self.create(options={})
       url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0'
-      client = build_client(url, options[:namespace])
-      return ConnectionPool.new(:timeout => 1, :size => (options[:size] || Sidekiq.options[:concurrency] || 25)) { client } unless options[:use_pool] == false
-      client
+      ConnectionPool::Wrapper.new(:timeout => 1, :size => (options[:size] || Sidekiq.options[:concurrency] || 25)) do
+        build_client(url, options[:namespace])
+      end
     end
 
     def self.build_client(url, namespace)

data/lib/sidekiq/util.rb

@@ -50,24 +50,12 @@ module Sidekiq
       Sidekiq::Util.logger
     end
 
-    def redis
-      Sidekiq.redis
+    def redis(&block)
+      Sidekiq.redis(&block)
     end
 
     def process_id
-      Sidekiq::Util.process_id
-    end
-
-    def self.process_id
-      @pid ||= begin
-        if Process.pid == 1
-          # Heroku does not expose pids.
-          require 'securerandom'
-          (SecureRandom.random_number * 4_000_000_000).floor.to_s(16)
-        else
-          Process.pid
-        end
-      end
+      Process.pid
     end
   end
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/sidekiq/web.rb

@@ -0,0 +1,93 @@
+require 'sinatra/base'
+require 'slim'
+require 'sprockets'
+
+module Sidekiq
+  class SprocketsMiddleware
+    def initialize(app, options={})
+      @app = app
+      @root = options[:root]
+      path   =  options[:path] || 'assets'
+      @matcher = /^\/#{path}\/*/
+      @environment = ::Sprockets::Environment.new(@root)
+      @environment.append_path 'assets/javascripts'
+      @environment.append_path 'assets/javascripts/vendor'
+      @environment.append_path 'assets/stylesheets'
+      @environment.append_path 'assets/stylesheets/vendor'
+      @environment.append_path 'assets/images'
+    end
+
+    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']}/" }, []] if env['SCRIPT_NAME'] == env['REQUEST_PATH']
+
+      return @app.call(env) unless @matcher =~ env["PATH_INFO"]
+      env['PATH_INFO'].sub!(@matcher,'')
+      @environment.call(env)
+    end
+  end
+
+  class Web < Sinatra::Base
+    dir = File.expand_path(File.dirname(__FILE__) + "/../../web")
+    set :views,  "#{dir}/views"
+    set :root, "#{dir}/public"
+    set :slim, :pretty => true
+    use SprocketsMiddleware, :root => dir
+
+    helpers do
+      def workers
+        @workers ||= begin
+          Sidekiq.redis.with_connection do |conn|
+            conn.smembers('workers').map do |w|
+              msg = conn.get("worker:#{w}")
+              msg = MultiJson.decode(msg) if msg
+              [w, msg]
+            end.sort { |x| x[1] ? -1 : 1 }
+          end
+        end
+      end
+
+      def processed
+        Sidekiq.redis.get('stat:processed') || 0
+      end
+
+      def failed
+        Sidekiq.redis.get('stat:failed') || 0
+      end
+
+      def queues
+        Sidekiq.redis.with_connection do |conn|
+          conn.smembers('queues').map do |q|
+            [q, conn.llen("queue:#{q}") || 0]
+          end.sort { |x,y| x[1] <=> y[1] }
+        end
+      end
+
+      def location
+        Sidekiq.redis.client.location
+      end
+
+      def root_path
+        "#{env['SCRIPT_NAME']}/"
+      end
+
+      def status
+        return 'down' if workers.size == 0
+        return 'idle' if workers.size > 0 && workers.map { |x| x[1] }.compact.size == 0
+        return 'active'
+      end
+    end
+
+    get "/" do
+      slim :index
+    end
+
+    get "/queues/:name" do
+      @name = params[:name]
+      @messages = Sidekiq.redis.lrange("queue:#{@name}", 0, 10).map { |str| MultiJson.decode(str) }
+      slim :queue
+    end
+  end
+
+end

data/lib/sidekiq/worker.rb

@@ -24,10 +24,6 @@ module Sidekiq
       base.extend(ClassMethods)
     end
 
-    def logger
-      Sidekiq::Util.logger
-    end
-
     module ClassMethods
       def perform_async(*args)
         Sidekiq::Client.push('class' => self.name, 'args' => args)

data/myapp/Gemfile

@@ -1,7 +1,19 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.1'
-gem 'sqlite3'
+platforms :ruby do
+    gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
+gem 'rails', '3.2.2'
 gem 'sidekiq', :path => '..'
-gem 'resque'
 gem 'capistrano'
+
+# sidekiq-web dependencies
+gem 'slim'
+gem 'sinatra'
+gem 'sprockets'

data/myapp/app/controllers/work_controller.rb

@@ -13,7 +13,7 @@ class WorkController < ApplicationController
   end
 
   def long
-    10.times do |x|
+    50.times do |x|
       HardWorker.perform_async('bob', 10, x)
     end
     render :text => 'enqueued'

data/myapp/config/initializers/sidekiq.rb

@@ -1,6 +1,6 @@
 Sidekiq.configure_client do |config|
-  config.redis = { :namespace => 'resque', :size => 2 }
+  config.redis = { :size => 2 }
 end
 Sidekiq.configure_server do |config|
-  config.redis = { :namespace => 'resque', :size => 25 }
+  config.redis = { :size => 25 }
 end

data/myapp/config/routes.rb

@@ -1,7 +1,7 @@
-require 'resque/server'
+require 'sidekiq/web'
 
 Myapp::Application.routes.draw do
-  mount Resque::Server.new, :at => '/resque'
+  mount Sidekiq::Web => '/sidekiq'
   get "work" => "work#index"
   get "work/email" => "work#email"
   get "work/post" => "work#delayed_post"

data/sidekiq.gemspec

@@ -15,10 +15,12 @@ Gem::Specification.new do |gem|
   gem.version       = Sidekiq::VERSION
   gem.add_dependency                  'redis'
   gem.add_dependency                  'redis-namespace'
-  gem.add_dependency                  'connection_pool'
+  gem.add_dependency                  'connection_pool', '>= 0.9.0'
   gem.add_dependency                  'celluloid'
   gem.add_dependency                  'multi_json'
   gem.add_development_dependency      'minitest'
+  gem.add_development_dependency      'sinatra'
+  gem.add_development_dependency      'slim'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'actionmailer'
   gem.add_development_dependency      'activerecord'

data/test/helper.rb

@@ -8,5 +8,9 @@ require 'minitest/unit'
 require 'minitest/pride'
 require 'minitest/autorun'
 
+require 'sidekiq'
 require 'sidekiq/util'
 Sidekiq::Util.logger.level = Logger::ERROR
+
+require 'sidekiq/redis_connection'
+REDIS = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')

data/test/test_cli.rb

@@ -2,10 +2,20 @@ require 'helper'
 require 'sidekiq/cli'
 require 'tempfile'
 
+cli = Sidekiq::CLI.instance
+def cli.die(code)
+  @code = code
+end
+
+def cli.valid?
+  !@code
+end
+
 class TestCli < MiniTest::Unit::TestCase
   describe 'with cli' do
+
     before do
-      @cli = new_cli
+      @cli = Sidekiq::CLI.instance
     end
 
     it 'blows up with an invalid require' do
@@ -14,7 +24,7 @@ class TestCli < MiniTest::Unit::TestCase
       end
     end
 
-    it 'blows up with invalid Ruby' do
+    it 'requires the specified Ruby code' do
       @cli.parse(['sidekiq', '-r', './test/fake_env.rb'])
       assert($LOADED_FEATURES.any? { |x| x =~ /fake_env/ })
       assert @cli.valid?
@@ -30,11 +40,24 @@ class TestCli < MiniTest::Unit::TestCase
       assert_equal ['foo'], Sidekiq.options[:queues]
     end
 
+    it 'changes timeout' do
+      @cli.parse(['sidekiq', '-t', '30', '-r', './test/fake_env.rb'])
+      assert_equal 30, Sidekiq.options[:timeout]
+    end
+
     it 'handles weights' 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
     end
 
+    it 'sets verbose' do
+      old = Sidekiq::Util.logger.level
+      @cli.parse(['sidekiq', '-v', '-r', './test/fake_env.rb'])
+      assert_equal Logger::DEBUG, Sidekiq::Util.logger.level
+      # If we leave the logger at DEBUG it'll add a lot of noise to the test output
+      Sidekiq::Util.logger.level = old
+    end
+
     describe 'with pidfile' do
       before do
         @tmp_file = Tempfile.new('sidekiq-test')
@@ -140,17 +163,6 @@ class TestCli < MiniTest::Unit::TestCase
         assert_equal 3, Sidekiq.options[:queues].select{ |q| q == 'seldom' }.length
       end
     end
-
-    def new_cli
-      cli = Sidekiq::CLI.new
-      def cli.die(code)
-        @code = code
-      end
-
-      def cli.valid?
-        !@code
-      end
-      cli
-    end
   end
+
 end

data/test/test_client.rb

@@ -5,7 +5,7 @@ require 'sidekiq/worker'
 class TestClient < MiniTest::Unit::TestCase
   describe 'with real redis' do
     before do
-      Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
+      Sidekiq.redis = REDIS
       Sidekiq.redis.flushdb
     end
 
@@ -13,7 +13,6 @@ class TestClient < MiniTest::Unit::TestCase
       Sidekiq.client_middleware.entries.clear
       Sidekiq.client_middleware do |chain|
         chain.add Sidekiq::Middleware::Client::UniqueJobs
-        chain.add Sidekiq::Middleware::Client::ResqueWebCompatibility
       end
       10.times { Sidekiq::Client.push('customqueue', 'class' => 'Foo', 'args' => [1, 2]) }
       assert_equal 1, Sidekiq.redis.llen("queue:customqueue")
@@ -39,6 +38,7 @@ class TestClient < MiniTest::Unit::TestCase
       def @redis.setex(*); nil; end
       def @redis.expire(*); true; end
       def @redis.with_connection; yield self; end
+      def @redis.with; yield self; end
       Sidekiq.instance_variable_set(:@redis, @redis)
     end
 

data/test/test_extensions.rb

@@ -5,13 +5,13 @@ require 'action_mailer'
 require 'sidekiq/extensions/action_mailer'
 require 'sidekiq/extensions/active_record'
 
+Sidekiq.hook_rails!
 
 class TestExtensions < MiniTest::Unit::TestCase
   describe 'sidekiq extensions' do
     before do
-      Sidekiq.client_middleware.entries.clear
-      Sidekiq.instance_variable_set(:@redis, MiniTest::Mock.new)
-      @redis = Sidekiq.redis
+      Sidekiq.redis = REDIS
+      Sidekiq.redis.flushdb
     end
 
     class MyModel < ActiveRecord::Base
@@ -21,9 +21,11 @@ class TestExtensions < MiniTest::Unit::TestCase
     end
 
     it 'allows delayed exection of ActiveRecord class methods' do
-      @redis.expect(:rpush, @redis, ['queue:default', "{\"class\":\"Sidekiq::Extensions::DelayedModel\",\"args\":[\"---\\n- !ruby/class 'TestExtensions::MyModel'\\n- :long_class_method\\n- []\\n\"]}"])
+      assert_equal [], Sidekiq::Client.registered_queues
+      assert_equal 0, Sidekiq.redis.llen('queue:default')
       MyModel.delay.long_class_method
-      @redis.verify
+      assert_equal ['default'], Sidekiq::Client.registered_queues
+      assert_equal 1, Sidekiq.redis.llen('queue:default')
     end
 
     it 'allows delayed exection of ActiveRecord instance methods' do
@@ -37,9 +39,11 @@ class TestExtensions < MiniTest::Unit::TestCase
     end
 
     it 'allows delayed delivery of ActionMailer mails' do
-      @redis.expect(:rpush, @redis, ['queue:default', "{\"class\":\"Sidekiq::Extensions::DelayedMailer\",\"args\":[\"---\\n- !ruby/class 'TestExtensions::UserMailer'\\n- :greetings\\n- - 1\\n  - 2\\n\"]}"])
+      assert_equal [], Sidekiq::Client.registered_queues
+      assert_equal 0, Sidekiq.redis.llen('queue:default')
       UserMailer.delay.greetings(1, 2)
-      @redis.verify
+      assert_equal ['default'], Sidekiq::Client.registered_queues
+      assert_equal 1, Sidekiq.redis.llen('queue:default')
     end
 
   end