sidekiq 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 981fa47de9add237cde6413d7e97aa70726ae757
-  data.tar.gz: 52151d63cf02724358c925155d8f3471f453fe75
+  metadata.gz: a3977388ec259ea1ceaaecb66a201c6d84281060
+  data.tar.gz: 66ea0b036b3a178b266013bbaef05cc602efe270
 SHA512:
-  metadata.gz: 977c16381346d0fea1968ecd4d8efd2a5b900e0a0a4e4017c21fddeb910977b716959a7d8cb6515260ee4da4f58fe645a13a75b0985663594798e2f80980dcea
-  data.tar.gz: 2852d63ccf3686dfa438d468fdc6593ad25cd95c2f727d0c0e71625ab0c6fa42af394826105a0b7a12d103c635ea6beff8d2fb757e2ea53ef7bfb8c8785ad6e0
+  metadata.gz: 027e42c3e2952cf9851e2239cbcc8ac50f76a11137a78acb2bd8351845dd7c2f7455ff010fee6f70d36cf65bd827aa15579f3e654d01fe7d8663cb86b8a0b71e
+  data.tar.gz: cd645448a7628606f7ca5403cd401ced5d618aab1122c386a9d34cd6cd8443d7b62c054462a532c3950e059a2eaf5543a992bce52e2a00908bf583b38d56b4ba

data/.travis.yml

@@ -4,8 +4,8 @@ cache: bundler
 services:
   - redis-server
 rvm:
-  - 2.1.7
   - 2.0.0
+  - 2.1.8
   - 2.2.4
   - 2.3.0
   - jruby
@@ -14,4 +14,3 @@ rvm:
 matrix:
   allow_failures:
     - rvm: rbx-2
-    - rvm: jruby-head

data/Changes.md

@@ -1,5 +1,33 @@
 # Sidekiq Changes
 
+4.1.0
+-----------
+
+- Tag quiet processes in the Web UI [#2757, jcarlson]
+- Pass last exception to sidekiq\_retries\_exhausted block [#2787, Nowaker]
+```ruby
+class MyWorker
+  include Sidekiq::Worker
+  sidekiq_retries_exhausted do |job, exception|
+  end
+end
+```
+- Add native support for ActiveJob's `set(options)` method allowing
+you to override worker options dynamically.  This should make it
+even easier to switch between ActiveJob and Sidekiq's native APIs [#2780]
+```ruby
+class MyWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: 'default', retry: true
+
+  def perform(*args)
+    # do something
+  end
+end
+
+MyWorker.set(queue: 'high', retry: false).perform_async(1)
+```
+
 4.0.2
 -----------
 
@@ -30,6 +58,12 @@ Sidekiq::Queues.clear_all
   [detailed on my blog](http://www.mikeperham.com/2015/10/14/optimizing-sidekiq/).
 - See the [4.0 upgrade notes](4.0-Upgrade.md) for more detail.
 
+3.5.4
+-----------
+
+- Ensure exception message is a string [#2707]
+- Revert racy Process.kill usage in sidekiqctl
+
 3.5.3
 -----------
 

data/Ent-Changes.md

@@ -3,6 +3,24 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+1.2.0
+-------------
+
+- **NEW FEATURE** Multi-process mode!  Sidekiq Enterprise can now fork multiple worker
+  processes, enabling significant memory savings.  See the [wiki
+documentation](https://github.com/mperham/sidekiq/wiki/Ent-Multi-Process) for details.
+
+
+0.7.10
+-------------
+
+- More precise gemspec dependency versioning
+
+1.1.0
+-------------
+
+- **NEW FEATURE** Historical queue metrics, [documented in the wiki](https://github.com/mperham/sidekiq/wiki/Ent-Historical-Metrics) [#2719]
+
 0.7.9, 1.0.2
 -------------
 

data/Pro-Changes.md

@@ -3,6 +3,18 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+HEAD
+-----------
+
+- Make job registration with batch part of the atomic push so batch
+  metadata can't get out of sync with the job data. [#2714]
+
+3.0.1
+-----------
+
+- Remove a number of Redis version checks since we can assume 2.8+ now.
+- Fix expiring jobs client middleware not loaded on server
+
 3.0.0
 -----------
 

data/README.md

@@ -64,23 +64,21 @@ quality open source development all at the same time.  Please see the
 [Sidekiq](http://sidekiq.org/) homepage for more detail.
 
 
-More Information
+Problems?
 -----------------
 
+**Please do not directly email any Sidekiq committers with questions or problems.**  A community is best served when discussions are held in public.
+
 Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for the official documentation.
 [mperham/sidekiq on Gitter](https://gitter.im/mperham/sidekiq) is dedicated to this project,
-but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).  Release announcements are made to the [@sidekiq](https://twitter.com/sidekiq) Twitter account.
-
-You may also find useful a [Reddit area](https://reddit.com/r/sidekiq) dedicated to Sidekiq discussion and [a Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow.
+but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).  Release announcements are made to the [@sidekiq](https://twitter.com/sidekiq) Twitter account.  **No support via Twitter.**
 
+Every Friday morning is Sidekiq happy hour: I video chat and answer questions.
+See the [Sidekiq support page](http://sidekiq.org/support).
 
-Problems?
------------------
-
-**Please do not directly email any Sidekiq committers with questions or problems.**  A community is best served when discussions are held in public.
+You may also find useful a [Reddit area](https://reddit.com/r/sidekiq) dedicated to Sidekiq discussion and [a Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow.
 
-If you have a problem, please review the [FAQ](https://github.com/mperham/sidekiq/wiki/FAQ) and [Troubleshooting](https://github.com/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, chat in Gitter, or open a new issue.
-StackOverflow or Reddit is the preferred place to ask questions on usage. If you are encountering what you think is a bug, please open an issue.
+If you have a problem, please review the [FAQ](https://github.com/mperham/sidekiq/wiki/FAQ) and [Troubleshooting](https://github.com/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, chat in Gitter, or open a new issue.  StackOverflow or Reddit is the preferred place to ask questions on usage. If you are encountering what you think is a bug, please open an issue.
 
 
 Thanks

data/code_of_conduct.md

@@ -0,0 +1,50 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project maintainer at mperham AT gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

data/lib/sidekiq/api.rb

@@ -191,6 +191,9 @@ module Sidekiq
   class Queue
     include Enumerable
 
+    ##
+    # Return all known queues within Redis.
+    #
     def self.all
       Sidekiq.redis {|c| c.smembers('queues'.freeze) }.sort.map {|q| Sidekiq::Queue.new(q) }
     end
@@ -211,6 +214,11 @@ module Sidekiq
       false
     end
 
+    ##
+    # Calculates this queue's latency, the difference in seconds since the oldest
+    # job in the queue was enqueued.
+    #
+    # @return Float
     def latency
       entry = Sidekiq.redis do |conn|
         conn.lrange(@rname, -1, -1)
@@ -227,7 +235,7 @@ module Sidekiq
 
       while true do
         range_start = page * page_size - deleted_size
-        range_end   = page * page_size - deleted_size + (page_size - 1)
+        range_end   = range_start + page_size - 1
         entries = Sidekiq.redis do |conn|
           conn.lrange @rname, range_start, range_end
         end
@@ -240,6 +248,11 @@ module Sidekiq
       end
     end
 
+    ##
+    # Find the job with the given JID within this queue.
+    #
+    # This is a slow, inefficient operation.  Do not use under
+    # normal conditions.  Sidekiq Pro contains a faster version.
     def find_job(jid)
       detect { |j| j.jid == jid }
     end
@@ -349,7 +362,7 @@ module Sidekiq
     end
 
     def [](name)
-      @item.__send__(:[], name)
+      @item[name]
     end
 
     private
@@ -502,7 +515,7 @@ module Sidekiq
 
       while true do
         range_start = page * page_size + offset_size
-        range_end   = page * page_size + offset_size + (page_size - 1)
+        range_end   = range_start + page_size - 1
         elements = Sidekiq.redis do |conn|
           conn.zrange name, range_start, range_end, with_scores: true
         end
@@ -531,6 +544,11 @@ module Sidekiq
       end
     end
 
+    ##
+    # Find the job with the given JID within this sorted set.
+    #
+    # This is a slow, inefficient operation.  Do not use under
+    # normal conditions.  Sidekiq Pro contains a faster version.
     def find_job(jid)
       self.detect { |j| j.jid == jid }
     end
@@ -633,7 +651,6 @@ module Sidekiq
   #
   # Yields a Sidekiq::Process.
   #
-
   class ProcessSet
     include Enumerable
 
@@ -674,13 +691,13 @@ module Sidekiq
         # you'll be happier this way
         result = conn.pipelined do
           procs.each do |key|
-            conn.hmget(key, 'info', 'busy', 'beat')
+            conn.hmget(key, 'info', 'busy', 'beat', 'quiet')
           end
         end
 
-        result.each do |info, busy, at_s|
+        result.each do |info, busy, at_s, quiet|
           hash = Sidekiq.load_json(info)
-          yield Process.new(hash.merge('busy' => busy.to_i, 'beat' => at_s.to_f))
+          yield Process.new(hash.merge('busy' => busy.to_i, 'beat' => at_s.to_f, 'quiet' => quiet))
         end
       end
 
@@ -697,7 +714,8 @@ module Sidekiq
   end
 
   #
-  # Sidekiq::Process has a set of attributes which look like this:
+  # Sidekiq::Process represents an active Sidekiq process talking with Redis.
+  # Each process has a set of attributes which look like this:
   #
   # {
   #   'hostname' => 'app-1.example.com',
@@ -739,6 +757,10 @@ module Sidekiq
       signal('TTIN')
     end
 
+    def stopping?
+      self['quiet'] == 'true'
+    end
+
     private
 
     def signal(sig)
@@ -757,6 +779,7 @@ module Sidekiq
   end
 
   ##
+  # A worker is a thread that is currently processing a job.
   # Programmatic access to the current active worker set.
   #
   # WARNING WARNING WARNING

data/lib/sidekiq/cli.rb

@@ -76,9 +76,8 @@ module Sidekiq
       # Starting here the process will now have multiple threads running.
       fire_event(:startup)
 
-      logger.debug {
-        "Middleware: #{Sidekiq.server_middleware.map(&:klass).join(', ')}"
-      }
+      logger.debug { "Client Middleware: #{Sidekiq.client_middleware.map(&:klass).join(', ')}" }
+      logger.debug { "Server Middleware: #{Sidekiq.server_middleware.map(&:klass).join(', ')}" }
 
       if !options[:daemon]
         logger.info 'Starting processing, hit Ctrl-C to stop'

data/lib/sidekiq/client.rb

@@ -35,10 +35,8 @@ module Sidekiq
     #   Sidekiq::Client.new(ConnectionPool.new { Redis.new })
     #
     # Generally this is only needed for very large Sidekiq installs processing
-    # more than thousands jobs per second.  I do not recommend sharding unless
-    # you truly cannot scale any other way (e.g. splitting your app into smaller apps).
-    # Some features, like the API, do not support sharding: they are designed to work
-    # against a single Redis instance only.
+    # thousands of jobs per second.  I don't recommend sharding unless you
+    # cannot scale any other way (e.g. splitting your app into smaller apps).
     def initialize(redis_pool=nil)
       @redis_pool = redis_pool || Thread.current[:sidekiq_via_pool] || Sidekiq.redis_pool
     end
@@ -49,11 +47,12 @@ module Sidekiq
     #   queue - the named queue to use, default 'default'
     #   class - the worker class to call, required
     #   args - an array of simple arguments to the perform method, must be JSON-serializable
-    #   retry - whether to retry this job if it fails, true or false, default true
+    #   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
     #
     # All options must be strings, not symbols.  NB: because we are serializing to JSON, all
-    # symbols in 'args' will be converted to strings.
+    # symbols in 'args' will be converted to strings.  Note that +backtrace: true+ can take quite a bit of
+    # space in Redis; a large volume of failing jobs can start Redis swapping if you aren't careful.
     #
     # Returns a unique Job ID.  If middleware stops the job, nil will be returned instead.
     #
@@ -72,9 +71,8 @@ module Sidekiq
 
     ##
     # Push a large number of jobs to Redis.  In practice this method is only
-    # useful if you are pushing tens of thousands of jobs or more, or if you need
-    # to ensure that a batch doesn't complete prematurely.  This method
-    # basically cuts down on the redis round trip latency.
+    # useful if you are pushing thousands of jobs or more.  This method
+    # cuts out the redis network round trip latency.
     #
     # Takes the same arguments as #push except that args is expected to be
     # an Array of Arrays.  All other keys are duplicated for each job.  Each job
@@ -104,10 +102,8 @@ module Sidekiq
     #   end
     #
     # Generally this is only needed for very large Sidekiq installs processing
-    # more than thousands jobs per second.  I do not recommend sharding unless
-    # you truly cannot scale any other way (e.g. splitting your app into smaller apps).
-    # Some features, like the API, do not support sharding: they are designed to work
-    # against a single Redis instance.
+    # thousands of jobs per second.  I do not recommend sharding unless
+    # you cannot scale any other way (e.g. splitting your app into smaller apps).
     def self.via(pool)
       raise ArgumentError, "No pool given" if pool.nil?
       raise RuntimeError, "Sidekiq::Client.via is not re-entrant" if x = Thread.current[:sidekiq_via_pool] && x != pool

data/lib/sidekiq/launcher.rb

@@ -95,7 +95,7 @@ module Sidekiq
         _, _, _, msg = Sidekiq.redis do |conn|
           conn.pipelined do
             conn.sadd('processes', key)
-            conn.hmset(key, 'info', json, 'busy', Processor::WORKER_STATE.size, 'beat', Time.now.to_f)
+            conn.hmset(key, 'info', json, 'busy', Processor::WORKER_STATE.size, 'beat', Time.now.to_f, 'quiet', @done)
             conn.expire(key, 60)
             conn.rpop("#{key}-signals")
           end

data/lib/sidekiq/manager.rb

@@ -55,7 +55,8 @@ module Sidekiq
       fire_event(:quiet, true)
     end
 
-    PAUSE_TIME = $TESTING ? 0.1 : 0.5
+    # hack for quicker development / testing environment #2774
+    PAUSE_TIME = STDOUT.tty? ? 0.1 : 0.5
 
     def stop(deadline)
       quiet

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

@@ -130,17 +130,17 @@ module Sidekiq
             end
           else
             # Goodbye dear message, you (re)tried your best I'm sure.
-            retries_exhausted(worker, msg)
+            retries_exhausted(worker, msg, exception)
           end
 
           raise exception
         end
 
-        def retries_exhausted(worker, msg)
+        def retries_exhausted(worker, msg, exception)
           logger.debug { "Dropping message after hitting the retry maximum: #{msg}" }
           begin
             if worker.sidekiq_retries_exhausted_block?
-              worker.sidekiq_retries_exhausted_block.call(msg)
+              worker.sidekiq_retries_exhausted_block.call(msg, exception)
             end
           rescue => e
             handle_exception(e, { context: "Error calling retries_exhausted for #{worker.class}", job: msg })

data/lib/sidekiq/testing.rb

@@ -170,7 +170,7 @@ module Sidekiq
       end
 
       def delete_for(jid, queue, klass)
-        jobs_by_queue[queue].delete_if { |job| job["jid"] == jid }
+        jobs_by_queue[queue.to_s].delete_if { |job| job["jid"] == jid }
         jobs_by_worker[klass].delete_if { |job| job["jid"] == jid }
       end
 

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "4.0.2"
+  VERSION = "4.1.0"
 end

data/lib/sidekiq/worker.rb

@@ -50,6 +50,11 @@ module Sidekiq
         raise ArgumentError, "Do not call .delay_until on a Sidekiq::Worker class, call .perform_at"
       end
 
+      def set(options)
+        Thread.current[:sidekiq_worker_set] = options
+        self
+      end
+
       def perform_async(*args)
         client_push('class' => self, 'args' => args)
       end
@@ -74,11 +79,15 @@ module Sidekiq
       # Allows customization for this type of Worker.
       # Legal options:
       #
-      #   :queue - use a named queue for this Worker, default 'default'
-      #   :retry - enable the RetryJobs middleware for this Worker, default *true*
-      #   :backtrace - whether to save any error backtrace in the retry payload to display in web UI,
+      #   queue - use a named queue for this Worker, default 'default'
+      #   retry - enable the RetryJobs middleware for this Worker, *true* to use the default
+      #      or *Integer* count
+      #   backtrace - whether to save any error backtrace in the retry payload to display in web UI,
       #      can be true, false or an integer number of lines to save, default *false*
-      #   :pool - use the given Redis connection pool to push this type of job to a given shard.
+      #   pool - use the given Redis connection pool to push this type of job to a given shard.
+      #
+      # In practice, any option is allowed.  This is the main mechanism to configure the
+      # options for a specific job.
       def sidekiq_options(opts={})
         self.sidekiq_options_hash = get_sidekiq_options.merge(opts.stringify_keys)
       end
@@ -97,7 +106,13 @@ module Sidekiq
 
       def client_push(item) # :nodoc:
         pool = Thread.current[:sidekiq_via_pool] || get_sidekiq_options['pool'] || Sidekiq.redis_pool
-        Sidekiq::Client.new(pool).push(item.stringify_keys)
+        hash = if Thread.current[:sidekiq_worker_set]
+          x, Thread.current[:sidekiq_worker_set] = Thread.current[:sidekiq_worker_set], nil
+          x.stringify_keys.merge(item.stringify_keys)
+        else
+          item.stringify_keys
+        end
+        Sidekiq::Client.new(pool).push(hash)
       end
 
     end

data/test/test_client.rb

@@ -191,4 +191,42 @@ class TestClient < Sidekiq::Test
       conn.verify
     end
   end
+
+  describe 'Sidekiq::Worker#set' do
+    class SetWorker
+      include Sidekiq::Worker
+      sidekiq_options :queue => :foo, 'retry' => 12
+    end
+
+    def setup
+      Sidekiq.redis {|c| c.flushdb }
+    end
+
+    it 'allows option overrides' do
+      q = Sidekiq::Queue.new('bar')
+      assert_equal 0, q.size
+      assert SetWorker.set(queue: :bar).perform_async(1)
+      job = q.first
+      assert_equal 'bar', job['queue']
+      assert_equal 12, job['retry']
+    end
+
+    it 'handles symbols and strings' do
+      q = Sidekiq::Queue.new('bar')
+      assert_equal 0, q.size
+      assert SetWorker.set('queue' => 'bar', :retry => 11).perform_async(1)
+      job = q.first
+      assert_equal 'bar', job['queue']
+      assert_equal 11, job['retry']
+
+      q.clear
+      assert SetWorker.perform_async(1)
+      assert_equal 0, q.size
+
+      q = Sidekiq::Queue.new('foo')
+      job = q.first
+      assert_equal 'foo', job['queue']
+      assert_equal 12, job['retry']
+    end
+  end
 end

data/test/test_retry_exhausted.rb

@@ -0,0 +1,123 @@
+# encoding: utf-8
+require_relative 'helper'
+require 'sidekiq/middleware/server/retry_jobs'
+
+class TestRetryExhausted < Sidekiq::Test
+  describe 'sidekiq_retries_exhausted' do
+    class NewWorker
+      include Sidekiq::Worker
+
+      class_attribute :exhausted_called, :exhausted_message, :exhausted_exception
+
+      sidekiq_retries_exhausted do |msg, e|
+        self.exhausted_called = true
+        self.exhausted_message = msg
+        self.exhausted_exception = e
+      end
+    end
+
+    class OldWorker
+      include Sidekiq::Worker
+
+      class_attribute :exhausted_called, :exhausted_message, :exhausted_exception
+
+      sidekiq_retries_exhausted do |msg|
+        self.exhausted_called = true
+        self.exhausted_message = msg
+      end
+    end
+
+    def cleanup
+      [NewWorker, OldWorker].each do |worker_class|
+        worker_class.exhausted_called = nil
+        worker_class.exhausted_message = nil
+        worker_class.exhausted_exception = nil
+      end
+    end
+
+    before do
+      cleanup
+    end
+
+    after do
+      cleanup
+    end
+
+    def new_worker
+      @new_worker ||= NewWorker.new
+    end
+
+    def old_worker
+      @old_worker ||= OldWorker.new
+    end
+
+    def handler(options={})
+      @handler ||= Sidekiq::Middleware::Server::RetryJobs.new(options)
+    end
+
+    def job(options={})
+      @job ||= {'class' => 'Bob', 'args' => [1, 2, 'foo']}.merge(options)
+    end
+
+    it 'does not run exhausted block when job successful on first run' do
+      handler.call(new_worker, job('retry' => 2), 'default') do
+        # successful
+      end
+
+      refute NewWorker.exhausted_called?
+    end
+
+    it 'does not run exhausted block when job successful on last retry' do
+      handler.call(new_worker, job('retry_count' => 0, 'retry' => 1), 'default') do
+        # successful
+      end
+
+      refute NewWorker.exhausted_called?
+    end
+
+    it 'does not run exhausted block when retries not exhausted yet' do
+      assert_raises RuntimeError do
+        handler.call(new_worker, job('retry' => 1), 'default') do
+          raise 'kerblammo!'
+        end
+      end
+
+      refute NewWorker.exhausted_called?
+    end
+
+    it 'runs exhausted block when retries exhausted' do
+      assert_raises RuntimeError do
+        handler.call(new_worker, job('retry_count' => 0, 'retry' => 1), 'default') do
+          raise 'kerblammo!'
+        end
+      end
+
+      assert NewWorker.exhausted_called?
+    end
+
+
+    it 'passes message and exception to retries exhausted block' do
+      raised_error = assert_raises RuntimeError do
+        handler.call(new_worker, job('retry_count' => 0, 'retry' => 1), 'default') do
+          raise 'kerblammo!'
+        end
+      end
+
+      assert new_worker.exhausted_called?
+      assert_equal raised_error.message, new_worker.exhausted_message['error_message']
+      assert_equal raised_error, new_worker.exhausted_exception
+    end
+
+    it 'passes message to retries exhausted block' do
+      raised_error = assert_raises RuntimeError do
+        handler.call(old_worker, job('retry_count' => 0, 'retry' => 1), 'default') do
+          raise 'kerblammo!'
+        end
+      end
+
+      assert old_worker.exhausted_called?
+      assert_equal raised_error.message, old_worker.exhausted_message['error_message']
+      assert_equal nil, new_worker.exhausted_exception
+    end
+  end
+end

data/test/test_scheduled.rb

@@ -90,7 +90,7 @@ class TestScheduled < Sidekiq::Test
     it 'generates random intervals that target a configured average' do
       with_sidekiq_option(:poll_interval_average, 10) do
         i = 500
-        intervals = i.times.map{ @poller.send(:random_poll_interval) }
+        intervals = Array.new(i){ @poller.send(:random_poll_interval) }
 
         assert intervals.all?{|x| x >= 5}
         assert intervals.all?{|x| x <= 15}

data/test/test_testing_fake.rb

@@ -261,6 +261,16 @@ class TestTesting < Sidekiq::Test
       assert_equal 1, SecondWorker.count
     end
 
+    it 'drains jobs of workers with symbolized queue names' do
+      Sidekiq::Worker.jobs.clear
+
+      AltQueueWorker.perform_async(5,6)
+      assert_equal 1, AltQueueWorker.jobs.size
+
+      Sidekiq::Worker.drain_all
+      assert_equal 0, AltQueueWorker.jobs.size
+    end
+
     it 'can execute a job' do
       DirectWorker.execute_job(DirectWorker.new, [2, 3])
     end

data/web/locales/ja.yml

@@ -6,8 +6,8 @@ ja:
   Namespace: ネームスペース
   Realtime: リアルタイム
   History: 履歴
-  Busy: ビジー
-  Processed: 処理完了
+  Busy: 実行中
+  Processed: 完了
   Failed: 失敗
   Scheduled: 予定
   Retries: 再試行
@@ -35,25 +35,25 @@ ja:
   RetryNow: 今すぐ再試行
   LastRetry: 再試行履歴
   OriginallyFailed: 失敗
-  AreYouSure: いいですか？
+  AreYouSure: よろしいですか？
   DeleteAll: 全て削除
   RetryAll: 全て再試行
   NoRetriesFound: 再試行するジョブはありません
   Error: エラー
-  ErrorClass: クラスエラー
+  ErrorClass: エラークラス
   ErrorMessage: エラーメッセージ
   ErrorBacktrace: エラーバックトレース
   GoBack: ← 戻る
-  NoScheduledFound: 予定したジョブはありません
+  NoScheduledFound: 予定されたジョブはありません
   When: いつ
-  ScheduledJobs: 予定したジョブ
+  ScheduledJobs: 予定されたジョブ
   idle: アイドル
   active: アクティブ
   Version: バージョン
   Connections: 接続
-  MemoryUsage: メモリー容量
-  PeakMemoryUsage: 最大メモリー容量
-  Uptime: Uptime (days)
+  MemoryUsage: メモリー使用量
+  PeakMemoryUsage: 最大メモリー使用量
+  Uptime: 連続稼働時間 (日)
   OneWeek: 1 週
   OneMonth: 1 ヶ月
   ThreeMonths: 3 ヶ月

data/web/views/busy.erb

@@ -30,6 +30,9 @@
           <% process.labels.each do |label| %>
             <span class="label label-info"><%= label %></span>
           <% end %>
+          <% if process.stopping? %>
+            <span class="label label-danger">Quiet</span>
+          <% end %>
           <br>
           <b><%= "#{t('Queues')}: " %></b>
           <%= process['queues'] * ", " %>
@@ -42,7 +45,9 @@
             <form method="POST">
               <%= csrf_tag %>
               <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
-              <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
+              <% unless process.stopping? %>
+                <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
+              <% end %>
               <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
             </form>
           </div>

data/web/views/retry.erb

@@ -7,7 +7,7 @@
       <tr>
         <th><%= t('ErrorClass') %></th>
         <td>
-          <code><%= @retry['error_class'] %></code>
+          <code><%= h @retry.display_class %></code>
         </td>
       </tr>
       <tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -185,6 +185,7 @@ files:
 - bin/sidekiq
 - bin/sidekiqctl
 - bin/sidekiqload
+- code_of_conduct.md
 - lib/generators/sidekiq/templates/worker.rb.erb
 - lib/generators/sidekiq/templates/worker_spec.rb.erb
 - lib/generators/sidekiq/templates/worker_test.rb.erb
@@ -241,6 +242,7 @@ files:
 - test/test_rails.rb
 - test/test_redis_connection.rb
 - test/test_retry.rb
+- test/test_retry_exhausted.rb
 - test/test_scheduled.rb
 - test/test_scheduling.rb
 - test/test_sidekiq.rb
@@ -392,6 +394,7 @@ test_files:
 - test/test_rails.rb
 - test/test_redis_connection.rb
 - test/test_retry.rb
+- test/test_retry_exhausted.rb
 - test/test_scheduled.rb
 - test/test_scheduling.rb
 - test/test_sidekiq.rb