sidekiq 3.3.0 → 3.3.1

data/lib/sidekiq/web_helpers.rb

@@ -38,14 +38,14 @@ module Sidekiq
       end
     end
 
-    def workers_size
-      @workers_size ||= workers.size
-    end
-
     def workers
       @workers ||= Sidekiq::Workers.new
     end
 
+    def processes
+      @processes ||= Sidekiq::ProcessSet.new
+    end
+
     def stats
       @stats ||= Sidekiq::Stats.new
     end
@@ -65,7 +65,7 @@ module Sidekiq
     end
 
     def namespace
-      @@ns ||= Sidekiq.redis {|conn| conn.respond_to?(:namespace) ? conn.namespace : nil }
+      @@ns ||= Sidekiq.redis { |conn| conn.respond_to?(:namespace) ? conn.namespace : nil }
     end
 
     def redis_info
@@ -89,7 +89,7 @@ module Sidekiq
     end
 
     def current_status
-      workers_size == 0 ? 'idle' : 'active'
+      workers.size == 0 ? 'idle' : 'active'
     end
 
     def relative_time(time)
@@ -110,9 +110,9 @@ module Sidekiq
     # Merge options with current params, filter safe params, and stringify to query string
     def qparams(options)
       options = options.stringify_keys
-      params.merge(options).map { |key, value|
+      params.merge(options).map do |key, value|
         SAFE_QPARAMS.include?(key) ? "#{key}=#{value}" : next
-      }.join("&")
+      end.join("&")
     end
 
     def truncate(text, truncate_after_chars = 2000)
@@ -147,7 +147,7 @@ module Sidekiq
         return number
       end
 
-      options = {:delimiter => ',', :separator => '.'}
+      options = {delimiter: ',', separator: '.'}
       parts = number.to_s.to_str.split('.')
       parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
       parts.join(options[:separator])
@@ -178,5 +178,9 @@ module Sidekiq
 
       "[#{environment.upcase}] " unless environment == "production"
     end
+
+    def product_version
+      "Sidekiq v#{Sidekiq::VERSION}"
+    end
   end
 end

data/lib/sidekiq/worker.rb

@@ -48,7 +48,7 @@ module Sidekiq
         item = { 'class' => self, 'args' => args, 'at' => ts }
 
         # Optimization to enqueue something now that is scheduled to go out now or in the past
-        item.delete('at') if ts <= now
+        item.delete('at'.freeze) if ts <= now
 
         client_push(item)
       end
@@ -65,7 +65,6 @@ module Sidekiq
       #   :pool - use the given Redis connection pool to push this type of job to a given shard.
       def sidekiq_options(opts={})
         self.sidekiq_options_hash = get_sidekiq_options.merge((opts || {}).stringify_keys)
-        ::Sidekiq.logger.warn("#{self.name} - :timeout is unsafe and support has been removed from Sidekiq, see http://bit.ly/OtYpK for details") if opts.include? :timeout
       end
 
       def sidekiq_retry_in(&block)

data/sidekiq.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Sidekiq::VERSION
   gem.add_dependency                  'redis', '>= 3.0.6'
   gem.add_dependency                  'redis-namespace', '>= 1.3.1'
-  gem.add_dependency                  'connection_pool', '>= 2.0.0'
+  gem.add_dependency                  'connection_pool', '>= 2.1.1'
   gem.add_dependency                  'celluloid', '>= 0.16.0'
   gem.add_dependency                  'json'
   gem.add_development_dependency      'sinatra'

data/test/test_api.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 
 class TestApi < Sidekiq::Test
 
@@ -77,8 +77,8 @@ class TestApi < Sidekiq::Test
 
     describe "queues" do
       it "is initially empty" do
-        s = Sidekiq::Stats.new
-        assert_equal 0, s.queues.size
+        s = Sidekiq::Stats::Queues.new
+        assert_equal 0, s.lengths.size
       end
 
       it "returns a hash of queue and size in order" do
@@ -90,9 +90,9 @@ class TestApi < Sidekiq::Test
           conn.sadd 'queues', 'bar'
         end
 
-        s = Sidekiq::Stats.new
-        assert_equal ({ "foo" => 1, "bar" => 3 }), s.queues
-        assert_equal "bar", s.queues.first.first
+        s = Sidekiq::Stats::Queues.new
+        assert_equal ({ "foo" => 1, "bar" => 3 }), s.lengths
+        assert_equal "bar", s.lengths.first.first
       end
     end
 
@@ -252,7 +252,7 @@ class TestApi < Sidekiq::Test
       job = Sidekiq::ScheduledSet.new.find_job(job_id)
       refute_nil job
       assert_equal job_id, job.jid
-      assert_in_delta job.latency, 0.0, 0.01
+      assert_in_delta job.latency, 0.0, 0.1
     end
 
     it 'can remove jobs when iterating over a sorted set' do
@@ -374,7 +374,15 @@ class TestApi < Sidekiq::Test
     end
 
     it 'can enumerate processes' do
-      odata = { 'pid' => 123, 'hostname' => hostname, 'key' => "#{hostname}:123", 'started_at' => Time.now.to_f - 15 }
+      identity_string = "identity_string"
+      odata = {
+        'pid' => 123,
+        'hostname' => hostname,
+        'key' => identity_string,
+        'identity' => identity_string,
+        'started_at' => Time.now.to_f - 15,
+      }
+
       time = Time.now.to_f
       Sidekiq.redis do |conn|
         conn.multi do
@@ -392,8 +400,9 @@ class TestApi < Sidekiq::Test
       assert_equal 123, data['pid']
       data.quiet!
       data.stop!
-      assert_equal "TERM", Sidekiq.redis{|c| c.lpop("#{hostname}:123-signals") }
-      assert_equal "USR1", Sidekiq.redis{|c| c.lpop("#{hostname}:123-signals") }
+      signals_string = "#{odata['key']}-signals"
+      assert_equal "TERM", Sidekiq.redis{|c| c.lpop(signals_string) }
+      assert_equal "USR1", Sidekiq.redis{|c| c.lpop(signals_string) }
     end
 
     it 'can enumerate workers' do

data/test/test_cli.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/cli'
 require 'tempfile'
 

data/test/test_client.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/client'
 require 'sidekiq/worker'
 

data/test/test_exception_handler.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/exception_handler'
 require 'stringio'
 require 'logger'

data/test/test_extensions.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq'
 require 'active_record'
 require 'action_mailer'

data/test/test_fetch.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/fetch'
 
 class TestFetcher < Sidekiq::Test

data/test/test_logging.rb

@@ -0,0 +1,34 @@
+require_relative 'helper'
+require 'sidekiq/logging'
+
+class TestFetcher < Sidekiq::Test
+  describe Sidekiq::Logging do
+    describe "#with_context" do
+      def context
+        Sidekiq::Logging.logger.formatter.context
+      end
+
+      it "has no context by default" do
+        context.must_equal nil
+      end
+
+      it "can add a context" do
+        Sidekiq::Logging.with_context "xx" do
+          context.must_equal " xx"
+        end
+        context.must_equal nil
+      end
+
+      it "can use multiple contexts" do
+        Sidekiq::Logging.with_context "xx" do
+          context.must_equal " xx"
+          Sidekiq::Logging.with_context "yy" do
+            context.must_equal " xx yy"
+          end
+          context.must_equal " xx"
+        end
+        context.must_equal nil
+      end
+    end
+  end
+end

data/test/test_manager.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/manager'
 
 class TestManager < Sidekiq::Test
@@ -121,7 +121,7 @@ class TestManager < Sidekiq::Test
           info = Sidekiq.redis { |c| c.hmget('identity', 'busy') }
           assert_equal ["1"], info
           expires = Sidekiq.redis { |c| c.pttl('identity') }
-          assert_in_delta 60000, expires, 10
+          assert_in_delta 60000, expires, 500
         end
       end
 

data/test/test_middleware.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/middleware/chain'
 require 'sidekiq/processor'
 

data/test/test_processor.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/processor'
 
 class TestProcessor < Sidekiq::Test

data/test/test_redis_connection.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/redis_connection'
 
 class TestRedisConnection < Sidekiq::Test

data/test/test_retry.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/scheduled'
 require 'sidekiq/middleware/server/retry_jobs'
 
@@ -110,11 +110,13 @@ class TestRetry < Sidekiq::Test
       c = nil
       assert_raises RuntimeError do
         handler.call(worker, msg, 'default') do
-          c = caller(0)[0..3]; raise "kerblammo!"
+          c = caller(0)[0...3]; raise "kerblammo!"
         end
       end
       assert msg["error_backtrace"]
       assert_equal c, msg["error_backtrace"]
+      assert_equal 3, c.size
+      assert_equal 3, msg["error_backtrace"].size
     end
 
     it 'handles a new failed message' do

data/test/test_scheduled.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/scheduled'
 
 class TestScheduled < Sidekiq::Test

data/test/test_scheduling.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq/scheduled'
 
 class TestScheduling < Sidekiq::Test

data/test/test_sidekiq.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'helper'
+require_relative 'helper'
 
 class TestSidekiq < Sidekiq::Test
   describe 'json processing' do
@@ -54,4 +54,16 @@ class TestSidekiq < Sidekiq::Test
       assert_equal 2, Sidekiq.options[:lifecycle_events][:startup].first.call
     end
   end
+
+  describe 'default_worker_options' do
+    before do
+      @old_options = Sidekiq.default_worker_options
+    end
+    after  { Sidekiq.default_worker_options = @old_options }
+
+    it 'stringify keys' do
+      Sidekiq.default_worker_options = { queue: 'cat'}
+      assert_equal 'cat', Sidekiq.default_worker_options['queue']
+    end
+  end
 end

data/test/test_testing.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq'
 require 'sidekiq/worker'
 require 'active_record'

data/test/test_testing_fake.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq'
 require 'sidekiq/worker'
 require 'active_record'

data/test/test_testing_inline.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq'
 require 'sidekiq/worker'
 require 'active_record'

data/test/test_web.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'sidekiq'
 require 'sidekiq/web'
 require 'rack/test'
@@ -50,17 +50,23 @@ class TestWeb < Sidekiq::Test
       end
 
       it 'can quiet a process' do
-        assert_nil Sidekiq.redis { |c| c.lpop "host:pid-signals" }
-        post '/busy', 'quiet' => '1', 'hostname' => 'host', 'pid' => 'pid'
+        identity = 'identity'
+        signals_key = "#{identity}-signals"
+
+        assert_nil Sidekiq.redis { |c| c.lpop signals_key }
+        post '/busy', 'quiet' => '1', 'identity' => identity
         assert_equal 302, last_response.status
-        assert_equal 'USR1', Sidekiq.redis { |c| c.lpop "host:pid-signals" }
+        assert_equal 'USR1', Sidekiq.redis { |c| c.lpop signals_key }
       end
 
       it 'can stop a process' do
-        assert_nil Sidekiq.redis { |c| c.lpop "host:pid-signals" }
-        post '/busy', 'stop' => '1', 'hostname' => 'host', 'pid' => 'pid'
+        identity = 'identity'
+        signals_key = "#{identity}-signals"
+
+        assert_nil Sidekiq.redis { |c| c.lpop signals_key }
+        post '/busy', 'stop' => '1', 'identity' => identity
         assert_equal 302, last_response.status
-        assert_equal 'TERM', Sidekiq.redis { |c| c.lpop "host:pid-signals" }
+        assert_equal 'TERM', Sidekiq.redis { |c| c.lpop signals_key }
       end
     end
 
@@ -352,6 +358,14 @@ class TestWeb < Sidekiq::Test
       end
     end
 
+    describe 'dashboard/stats' do
+      it 'redirects to stats' do
+        get '/dashboard/stats'
+        assert_equal 302, last_response.status
+        assert_equal 'http://example.org/stats', last_response.header['Location']
+      end
+    end
+
     describe 'stats' do
       include Sidekiq::Util
 
@@ -359,12 +373,13 @@ class TestWeb < Sidekiq::Test
         Sidekiq.redis do |conn|
           conn.set("stat:processed", 5)
           conn.set("stat:failed", 2)
+          conn.sadd("queues", "default")
         end
         2.times { add_retry }
         3.times { add_scheduled }
         4.times { add_worker }
 
-        get '/dashboard/stats'
+        get '/stats'
         @response = Sidekiq.load_json(last_response.body)
       end
 
@@ -389,6 +404,10 @@ class TestWeb < Sidekiq::Test
           assert_equal 4, @response["sidekiq"]["busy"]
         end
 
+        it 'reports processes' do
+          assert_equal 1, @response["sidekiq"]["processes"]
+        end
+
         it 'reports retries' do
           assert_equal 2, @response["sidekiq"]["retries"]
         end
@@ -429,6 +448,30 @@ class TestWeb < Sidekiq::Test
       end
     end
 
+    describe 'stats/queues' do
+      include Sidekiq::Util
+
+      before do
+        Sidekiq.redis do |conn|
+          conn.set("stat:processed", 5)
+          conn.set("stat:failed", 2)
+          conn.sadd("queues", "default")
+          conn.sadd("queues", "queue2")
+        end
+        2.times { add_retry }
+        3.times { add_scheduled }
+        4.times { add_worker }
+
+        get '/stats/queues'
+        @response = Sidekiq.load_json(last_response.body)
+      end
+
+      it 'reports the queue depth' do
+        assert_equal 0, @response["default"]
+        assert_equal 0, @response["queue2"]
+      end
+    end
+
     describe 'dead jobs' do
       it 'shows empty index' do
         get 'morgue'
@@ -529,7 +572,7 @@ class TestWeb < Sidekiq::Test
       Sidekiq.redis do |conn|
         conn.multi do
           conn.sadd("processes", key)
-          conn.hmset(key, 'busy', 4)
+          conn.hmset(key, 'info', Sidekiq.dump_json('hostname' => 'foo', 'started_at' => Time.now.to_f, "queues" => []), 'at', Time.now.to_f, 'busy', 4)
           conn.hmset("#{key}:workers", Time.now.to_f, msg)
         end
       end