sidekiq 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5eafdd7cf02082ddca6e556df6c2ef191c20380
-  data.tar.gz: eb520ecf4dd12b4c95da1d1b3765958aaf0f2e19
+  metadata.gz: 96202101069aaee71e462e2f3b91f5d4c58e952f
+  data.tar.gz: ad75e0b5dc019bb8d1058b124535190f00b06f60
 SHA512:
-  metadata.gz: 83ea17045bfd9f870b98af2292ff9490b752cd47bcdfdd8cfc73a5d4779e4ce56635b5ff7f4d76b6a791ff9e60b06281fc955e5cc1d3201f78a0d3ea995237bb
-  data.tar.gz: 784e604fac0fe0ffd914c87a973717de466b2b5a68bb710cddedd702ba39d4c2d6489a3be98ad868c8139f99d7cca231de593377bc268ca232c7c2dca585c3c8
+  metadata.gz: 4de121e1a00611b97f5c8838c5beb1d5a4fa5e6fb37e7cd7b2ac2074239d8a48d1d9526d4a8c0a94fcfcebe7ee3507209735569c78309f18d29363fbab24b992
+  data.tar.gz: 239a247dd69bab58148229f64d7b8ff12a658bb696c08c9f00b9ee9170c5d40ea052891eef5d89742633282d99095b4eb6004df298aa2f06b5f114fbbcfb10de

data/Changes.md

@@ -2,10 +2,18 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)
 
+HEAD
+-----------
+
+- Update gemspec to allow newer versions of the Redis gem [#3617]
+- Refactor Worker.set so it can be memoized [#3602]
+- Fix display of Redis URL in web footer, broken in 5.0.3 [#3560]
+
 5.0.4
 -----------
 
 - Fix "slow startup" performance regression from 5.0.2. [#3525]
+- Allow users to disable ID generation since some redis providers disable the CLIENT command. [#3521]
 
 5.0.3
 -----------

data/Ent-Changes.md

@@ -4,6 +4,11 @@
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+1.6.1
+-------------
+
+- Fix crash in rate limiter middleware when used with custom exceptions [#3604]
+
 1.6.0
 -------------
 

data/Gemfile

@@ -8,6 +8,9 @@ gem 'minitest'
 #gem 'minitest-utils'
 gem 'toxiproxy'
 
+# For Redis 4.0 support. Unreleased 9cb81bf.
+gem 'redis-namespace', git: 'https://github.com/resque/redis-namespace'
+
 platforms :rbx do
   gem 'rubysl', '~> 2.0'         # if using anything in the ruby standard library
   gem 'psych'                    # if using yaml

data/Pro-Changes.md

@@ -4,7 +4,14 @@
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
-HEAD
+3.5.3
+---------
+
+- Restore error check for super\_fetch's job ack [#3601]
+- Trim error messages saved in Batch's failure hash, preventing huge
+  messages from bloating Redis. [#3570]
+
+3.5.2
 ---------
 
 - Fix `Status#completed?` when run against a Batch that had succeeded

data/lib/sidekiq/api.rb

@@ -335,7 +335,7 @@ module Sidekiq
 
     def display_args
       # Unwrap known wrappers so they show up in a human-friendly manner in the Web UI
-      @args ||= case klass
+      @display_args ||= case klass
                 when /\ASidekiq::Extensions::Delayed/
                   safe_load(args[0], args) do |_, _, arg|
                     arg
@@ -458,14 +458,7 @@ module Sidekiq
     # Place job in the dead set
     def kill
       remove_job do |message|
-        now = Time.now.to_f
-        Sidekiq.redis do |conn|
-          conn.multi do
-            conn.zadd('dead', now, message)
-            conn.zremrangebyscore('dead', '-inf', now - DeadSet.timeout)
-            conn.zremrangebyrank('dead', 0, - DeadSet.max_jobs)
-          end
-        end
+        DeadSet.new.kill(message)
       end
     end
 
@@ -663,6 +656,17 @@ module Sidekiq
       super 'dead'
     end
 
+    def kill(message)
+      now = Time.now.to_f
+      Sidekiq.redis do |conn|
+        conn.multi do
+          conn.zadd(name, now.to_s, message)
+          conn.zremrangebyscore(name, '-inf', now - self.class.timeout)
+          conn.zremrangebyrank(name, 0, - self.class.max_jobs)
+        end
+      end
+    end
+
     def retry_all
       while size > 0
         each(&:retry)

data/lib/sidekiq/client.rb

@@ -51,7 +51,10 @@ module Sidekiq
     #   at - timestamp to schedule the job (optional), must be Numeric (e.g. Time.now.to_f)
     #   retry - whether to retry this job if it fails, default true or an integer number of retries
     #   backtrace - whether to save any error backtrace, default false
-    # 
+    #
+    # If class is set to the class name, the jobs' options will be based on Sidekiq's default
+    # worker options. Otherwise, they will be based on the job class's options.
+    #
     # Any options valid for a worker class's sidekiq_options are also available here.
     #
     # All options must be strings, not symbols.  NB: because we are serializing to JSON, all

data/lib/sidekiq/delay.rb

@@ -24,7 +24,7 @@ module Sidekiq
 
     module PsychAutoload
       def resolve_class(klass_name)
-        return klass_name unless klass_name
+        return nil if !klass_name || klass_name.empty?
         # constantize
         names = klass_name.split('::')
         names.shift if names.empty? || names.first.empty?

data/lib/sidekiq/job_retry.rb

@@ -184,14 +184,7 @@ module Sidekiq
     def send_to_morgue(msg)
       Sidekiq.logger.info { "Adding dead #{msg['class']} job #{msg['jid']}" }
       payload = Sidekiq.dump_json(msg)
-      now = Time.now.to_f
-      Sidekiq.redis do |conn|
-        conn.multi do
-          conn.zadd('dead', now, payload)
-          conn.zremrangebyscore('dead', '-inf', now - DeadSet.timeout)
-          conn.zremrangebyrank('dead', 0, -DeadSet.max_jobs)
-        end
-      end
+      DeadSet.new.kill(payload)
     end
 
     def retry_attempts_from(msg_retry, default)

data/lib/sidekiq/processor.rb

@@ -126,7 +126,7 @@ module Sidekiq
       pristine = cloned(job_hash)
 
       Sidekiq::Logging.with_job_hash_context(job_hash) do
-        @retrier.global(job_hash, queue) do
+        @retrier.global(pristine, queue) do
           @logging.call(job_hash, queue) do
             stats(pristine, queue) do
               # Rails 5 requires a Reloader to wrap code execution.  In order to
@@ -137,7 +137,7 @@ module Sidekiq
                 klass  = constantize(job_hash['class'.freeze])
                 worker = klass.new
                 worker.jid = job_hash['jid'.freeze]
-                @retrier.local(worker, job_hash, queue) do
+                @retrier.local(worker, pristine, queue) do
                   yield worker
                 end
               end
@@ -159,7 +159,7 @@ module Sidekiq
           job_hash = Sidekiq.load_json(jobstr)
         rescue => ex
           handle_exception(ex, { :context => "Invalid JSON for job", :jobstr => jobstr })
-          send_to_morgue(jobstr)
+          DeadSet.new.kill(jobstr)
           ack = true
           raise
         end
@@ -184,17 +184,6 @@ module Sidekiq
       end
     end
 
-    def send_to_morgue(msg)
-      now = Time.now.to_f
-      Sidekiq.redis do |conn|
-        conn.multi do
-          conn.zadd('dead', now, msg)
-          conn.zremrangebyscore('dead', '-inf', now - DeadSet.timeout)
-          conn.zremrangebyrank('dead', 0, -DeadSet.max_jobs)
-        end
-      end
-    end
-
     def execute_job(worker, cloned_args)
       worker.perform(*cloned_args)
     end

data/lib/sidekiq/util.rb

@@ -21,7 +21,7 @@ module Sidekiq
 
     def safe_thread(name, &block)
       Thread.new do
-        Thread.current['sidekiq_label'] = name
+        Thread.current['sidekiq_label'.freeze] = name
         watchdog(name, &block)
       end
     end

data/lib/sidekiq/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sidekiq
-  VERSION = "5.0.4"
+  VERSION = "5.0.5"
 end

data/lib/sidekiq/web/helpers.rb

@@ -148,7 +148,8 @@ module Sidekiq
     end
 
     def redis_connection
-      Sidekiq.redis { |conn| conn.client.id }
+      attrs = Sidekiq.redis { |conn| conn.connection }
+      "redis://#{attrs[:location]}/#{attrs[:db]}"
     end
 
     def namespace

data/lib/sidekiq/worker.rb

@@ -41,12 +41,13 @@ module Sidekiq
     #     SomeWorker.set(queue: 'foo').perform_async(....)
     #
     class Setter
-      def initialize(opts)
+      def initialize(klass, opts)
+        @klass = klass
         @opts = opts
       end
 
       def perform_async(*args)
-        @opts['class'.freeze].client_push(@opts.merge!('args'.freeze => args))
+        @klass.client_push(@opts.merge('args'.freeze => args, 'class'.freeze => @klass))
       end
 
       # +interval+ must be a timestamp, numeric or something that acts
@@ -56,10 +57,10 @@ module Sidekiq
         now = Time.now.to_f
         ts = (int < 1_000_000_000 ? now + int : int)
 
-        @opts.merge! 'args'.freeze => args, 'at'.freeze => ts
+        payload = @opts.merge('class'.freeze => @klass, 'args'.freeze => args, 'at'.freeze => ts)
         # Optimization to enqueue something now that is scheduled to go out now or in the past
-        @opts.delete('at'.freeze) if ts <= now
-        @opts['class'.freeze].client_push(@opts)
+        payload.delete('at'.freeze) if ts <= now
+        @klass.client_push(payload)
       end
       alias_method :perform_at, :perform_in
     end
@@ -79,7 +80,7 @@ module Sidekiq
       end
 
       def set(options)
-        Setter.new(options.merge!('class'.freeze => self))
+        Setter.new(self, options)
       end
 
       def perform_async(*args)

data/sidekiq.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.version       = Sidekiq::VERSION
   gem.required_ruby_version = ">= 2.2.2"
 
-  gem.add_dependency                  'redis', '~> 3.3', '>= 3.3.3'
+  gem.add_dependency                  'redis', '>= 3.3.4', '< 5'
   gem.add_dependency                  'connection_pool', '~> 2.2', '>= 2.2.0'
   gem.add_dependency                  'concurrent-ruby', '~> 1.0'
   gem.add_dependency                  'rack-protection', '>= 1.5.0'

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement