sidekiq 2.3.3 → 2.4.0

data/COMM-LICENSE

@@ -0,0 +1,83 @@
+THIS LICENSE AGREEMENT DESCRIBES YOUR RIGHTS WITH RESPECT TO THE SOFTWARE AND ITS COMPONENTS.
+
+1. OWNERSHIP, LICENSE GRANT
+
+This is a license agreement and not an agreement for sale. We reserve ownership of all intellectual property rights inherent in or relating to the Software, which include, but are not limited to, all copyright, patent rights, all rights in relation to registered and unregistered trademarks (including service marks), confidential information (including trade secrets and know-how) and all rights other than those expressly granted by this License Agreement.
+
+Subject to the payment of the fee required and subject to the terms and conditions of this License Agreement, We grant to You a revocable, non- transferable and non-exclusive license (i) for Designated User(s) (as defined below) within Your organization to install and use the Software on any workstations used exclusively by such Designated User and (ii) for You to install and use the Software in connection with unlimited domains and sub-domains on unlimited servers, solely in connection with distribution of the Software in accordance with sections 3 and 4 below. This license is not sublicensable except as explicitly set forth herein. “Designated User(s)” shall mean Your employee(s) acting within the scope of their employment or Your consultant(s) or contractor(s) acting within the scope of the services they provide for You or on Your behalf for whom You have purchased a license to use the Software.
+
+In addition to the other terms contained herein, We grant to You a revocable, non- transferable and non-exclusive license to install and use the Software on a single computer (the “Trial License”) strictly for Your internal evaluation and review purposes and not for production purposes. This Trial License applies only if You have registered with Us for a Trial License of the Software and shall be effective for forty-five (45) consecutive days following the date of registration (“the Trial Period”). You may only register for a Trial License once in any eighteen month period. You agree not to use a Trial License for any purpose other than determining whether to purchase a license to the Software. You are explicitly not permitted to distribute the Software to any user outside the Organization on whose behalf you have undertaken this license. Your rights to use the Trial License will immediately terminate upon the earlier of (i) the expiration of the Trial Period, or (ii) such time that You purchase a license to the Software. We reserve the right to terminate Your Trial License at any time in Our absolute and sole discretion.
+
+2. PERMITTED USES, SOURCE CODE, MODIFICATIONS
+
+We provide You with source code so that You can create Modifications of the original Software, where Modification means: a) any addition to or deletion from the contents of a file included in the original Software or previous Modifications created by You, or b) any new file that contains any part of the original Software or previous Modifications. While You retain all rights to any original work authored by You as part of the Modifications, We continue to own all copyright and other intellectual property rights in the Software.
+
+3. DISTRIBUTION
+
+You may distribute the Software in any applications, frameworks, or elements (collectively referred to as an “Application” or “Applications”) that you develop using the Software in accordance with this License Agreement, provided that such distribution does not violate the restrictions set forth in section 4 of this License Agreement. You must not remove, obscure or interfere with any copyright, acknowledgment, attribution, trademark, warning or disclaimer statement affixed to, incorporated in or otherwise applied in connection with the Software.
+
+You are required to ensure that the Software is not reused by or with any applications other than those with which You distribute it as permitted herein. For example, if You install the Software on a customer’s server, that customer is not permitted to use the Software independently of Your application, and must be informed as such.
+
+You will not owe Us any royalties for Your distribution of the Software in accordance with this License Agreement.
+
+4. PROHIBITED USES
+
+You may not, without Our prior written consent, redistribute the Software or Modifications other than by including the Software or a portion thereof within Your own product, which must have substantially different functionality than the Software or Modifications and must not allow any third party to use the Software or Modifications, or any portions thereof, for software development or application development purposes. You are explicitly not allowed to redistribute the Software or Modifications as part of any product that can be described as a development toolkit or library, an application builder, a website builder or any product that is intended for use by software, application, or website developers or designers. You are not allowed to redistribute any part of the Software documentation. You may not change or remove the copyright notice from any of the files included in the Software or Modifications.
+
+UNDER NO CIRCUMSTANCES MAY YOU USE THE SOFTWARE FOR A PRODUCT THAT IS INTENDED FOR SOFTWARE OR APPLICATION DEVELOPMENT PURPOSES.
+
+The Open Source version of the Software (“LGPL Version”) is licensed
+under the terms of the GNU Lesser General Public License versions 3.0
+(“LGPL”) and not under this License Agreement. If You, or another third
+party, has, at any time, developed all (or any portions of) the
+Application(s) using the LGPL Version, You may not combine such
+development work with the Software and must license such Application(s)
+(or any portions derived there from) under the terms of the GNU Lesser
+General Public License version 3, a copy of which is located at
+http://www.gnu.org/copyleft/lgpl.html.
+
+5. TERMINATION
+
+This License Agreement and Your right to use the Software and Modifications will terminate immediately without notice if You fail to comply with the terms and conditions of this License Agreement. Upon termination, You agree to immediately cease using and destroy the Software or Modifications, including all accompanying documents. The provisions of sections 4, 5, 6, 7, 8, 9, 10 and 12 will survive any termination of this License Agreement.
+
+6. DISCLAIMER OF WARRANTIES
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, WE AND OUR SUPPLIERS DISCLAIM ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT, WITH REGARD TO THE SOFTWARE. WE DO NOT GUARANTEE THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, AND YOU ACKNOWLEDGE THAT IT IS NOT TECHNICALLY PRACTICABLE FOR US TO DO SO.
+
+7. LIMITATION OF LIABILITIES
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL WE OR OUR SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION OR ANY OTHER PECUNIARY LAW) ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ANY CASE, OUR ENTIRE LIABILITY UNDER ANY PROVISION OF THIS LICENSE AGREEMENT SHALL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY YOU FOR THE SOFTWARE.
+
+8. VERIFICATION
+
+We or a certified auditor acting on Our behalf, may, upon its reasonable request and at its expense, audit You with respect to the use of the Software. Such audit may be conducted by mail, electronic means or through an in-person visit to Your place of business. Any such in-person audit shall be conducted during regular business hours at Your facilities and shall not unreasonably interfere with Your business activities. We shall not remove, copy, or redistribute any electronic material during the course of an audit. If an audit reveals that You are using the Software in a way that is in material violation of the terms of the License Agreement, then You shall pay Our reasonable costs of conducting the audit. In the case of a material violation, You agree to pay Us any amounts owing that are attributable to the unauthorized use. In the alternative, We reserve the right, at Our sole option, to terminate the licenses for the Software.
+
+9. THIRD PARTY SOFTWARE
+
+Examples included in Software may provide links to third party libraries or code (collectively “Third Party Software”) to implement various functions. Third Party Software does not comprise part of the Software. In some cases, access to Third Party Software may be included along with the Software delivery as a convenience for demonstration purposes. Such source code and libraries may be included in the “…/examples” source tree delivered with the Software and do not comprise the Software. Licensee acknowledges (1) that some part of Third Party Software may require additional licensing of copyright and patents from the owners of such, and (2) that distribution of any of the Software referencing or including any portion of a Third Party Software may require appropriate licensing from such third parties.
+
+10. PAYMENT AND TAXES
+
+If credit has been extended to You by Us, all payments under this License Agreement are due within thirty (30) days of the date We mail an invoice to You. If We have not extended credit to You, You shall be required to make payment concurrent with the delivery of the Software by Us. All amounts payable are gross amounts but exclusive of any value added tax, use tax, sales tax or similar tax. You shall be entitled to withhold from payments any applicable withholding taxes and comply with all applicable tax and employment legislation. Each party shall pay all taxes (including, but not limited to, taxes based upon its income) or levies imposed on it under applicable laws, regulations and tax treaties as a result of this Agreement and any payments made hereunder (including those required to be withheld or deducted from payments). Each party shall furnish evidence of such paid taxes as is sufficient to enable the other party to obtain any credits available to it, including original withholding tax certificates.
+
+11. MISCELLANEOUS
+
+The license granted herein applies only to the version of the Software available when purchased in connection with the terms of this License Agreement. Any previous or subsequent license granted to You for use of the Software shall be governed by the terms and conditions of the agreement entered in connection with purchase of that version of the Software. You agree that you will comply with all applicable laws and regulations with respect to the Software, including without limitation all export and re-export control laws and regulations.
+
+While redistributing the Software or Modifications thereof, You may choose to offer acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License Agreement. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on our behalf. You agree to indemnify, defend, and hold Us harmless from and against any liability incurred by, or claims asserted against, Us (i) by reason of Your accepting any such support, warranty, indemnity or additional liability; or (ii) arising out of the use, reproduction or distribution of Your Application, except to the extent such claim is solely based on the inclusion of the Software therein.
+
+You agree to be identified as a customer of ours and You agree that We may refer to You by name, trade name and trademark, if applicable, and may briefly describe Your business in our marketing materials and web site.
+
+You may not assign this License Agreement without Our prior written consent, which will not be unreasonably withheld. This License Agreement will inure to the benefit of Our successors and assigns.
+
+You acknowledge that this License Agreement is complete and is the exclusive representation of our agreement. No oral or written information given by Us or on our behalf shall create a warranty or collateral contract, or in any way increase the scope of this License Agreement in any way, and You may not rely on any such oral or written information. No term or condition contained in any purchase order shall apply unless expressly accepted by Us in writing,
+
+There are no implied licenses or other implied rights granted under this License Agreement, and all rights, save for those expressly granted hereunder, shall remain with Us and our licensors. In addition, no licenses or immunities are granted to the combination of the Software and/or Modifications, as applicable, with any other software or hardware not delivered by Us to You under this License Agreement.
+
+If any provision in this License Agreement shall be determined to be invalid, such provision shall be deemed omitted; the remainder of this License Agreement shall continue in full force and effect. If any remedy provided is determined to have failed for its essential purpose, all limitations of liability and exclusions of damages set forth in this License Agreement shall remain in effect.
+
+This License Agreement may be modified only by a written instrument signed by an authorized representative of each party.
+
+This License Agreement is governed by the law of the State of Oregon, United States (notwithstanding conflicts of laws provisions), and all parties irrevocably submit to the jurisdiction of the courts of the State of Oregon and further agree to commence any litigation which may arise hereunder in the state or federal courts located in the judicial district of Multnomah County, Oregon, US.
+
+If the Software or any related documentation is licensed to the U.S. government or any agency thereof, it will be deemed to be “commercial computer software” or “commercial computer software documentation,” pursuant to DFAR Section 227.7202 and FAR Section 12.212. Any use of the Software or related documentation by the U.S. government will be governed solely by the terms of this License Agreement.

data/Changes.md

@@ -1,3 +1,18 @@
+2.4.0
+-----------
+
+- ActionMailer.delay.method now only tries to deliver if method returns a valid message.
+- Logging now uses "MSG-#{Job ID}", not a random msg ID
+- Allow generic Redis provider as environment variable. [#443]
+- Add ability to customize sidekiq\_options with delay calls [#450]
+
+```ruby
+Foo.delay(:retry => false).bar
+Foo.delay(:retry => 10).bar
+Foo.delay(:timeout => 10.seconds).bar
+Foo.delay_for(5.minutes, :timeout => 10.seconds).bar
+```
+
 2.3.3
 -----------
 

data/LICENSE

@@ -4,5 +4,6 @@ Sidekiq is an Open Source project licensed under the terms of
 the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>
 for license text.
 
-A commercial license is available to those who buy Sidekiq Pro.
-Please see http://sidekiq.org/pro/ for more detail.
+Sidekiq Pro has a commercial-friendly license allowing private forks
+and modifications of Sidekiq.  Please see http://sidekiq.org/pro/ for
+more detail.  You can find the commercial license terms in COMM-LICENSE.

data/README.md

@@ -72,7 +72,6 @@ License
 
 Please see LICENSE for licensing details.
 
-<a href='http://www.pledgie.com/campaigns/16623'><img alt='Click here to lend your support to Open Source and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/16623.png?skin_name=chrome' border='0' /></a>
 
 Author
 -----------------

data/examples/config.yml

@@ -3,6 +3,8 @@
 #   sidekiq -C config.yml
 ---
 :verbose: false
+:pidfile: ./tmp/pids/sidekiq.pid
+:namespace: sidekiq_namespace
 :concurrency:  25
 :queues:
   - [often, 7]

data/lib/sidekiq/extensions/action_mailer.rb

@@ -16,16 +16,19 @@ module Sidekiq
 
       def perform(yml)
         (target, method_name, args) = YAML.load(yml)
-        target.send(method_name, *args).deliver
+        msg = target.send(method_name, *args)
+        # The email method can return nil, which causes ActionMailer to return
+        # an undeliverable empty message.
+        msg.deliver if msg && msg.to && msg.from
       end
     end
 
     module ActionMailer
-      def delay
-        Proxy.new(DelayedMailer, self)
+      def delay(options={})
+        Proxy.new(DelayedMailer, self, options)
       end
-      def delay_for(interval)
-        Proxy.new(DelayedMailer, self, Time.now.to_f + interval.to_f)
+      def delay_for(interval, options={})
+        Proxy.new(DelayedMailer, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
     end
 

data/lib/sidekiq/extensions/active_record.rb

@@ -21,11 +21,11 @@ module Sidekiq
     end
 
     module ActiveRecord
-      def delay
-        Proxy.new(DelayedModel, self)
+      def delay(options={})
+        Proxy.new(DelayedModel, self, options)
       end
-      def delay_for(interval)
-        Proxy.new(DelayedModel, self, Time.now.to_f + interval.to_f)
+      def delay_for(interval, options={})
+        Proxy.new(DelayedModel, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
     end
 

data/lib/sidekiq/extensions/class_methods.rb

@@ -19,11 +19,11 @@ module Sidekiq
     end
 
     module Klass
-      def delay
-        Proxy.new(DelayedClass, self)
+      def delay(options={})
+        Proxy.new(DelayedClass, self, options)
       end
-      def delay_for(interval)
-        Proxy.new(DelayedClass, self, Time.now.to_f + interval.to_f)
+      def delay_for(interval, options={})
+        Proxy.new(DelayedClass, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
     end
 

data/lib/sidekiq/extensions/generic_proxy.rb

@@ -1,10 +1,10 @@
 module Sidekiq
   module Extensions
     class Proxy < BasicObject
-      def initialize(performable, target, at=nil)
+      def initialize(performable, target, options={})
         @performable = performable
         @target = target
-        @at = at
+        @opts = options
       end
 
       def method_missing(name, *args)
@@ -14,11 +14,7 @@ module Sidekiq
         # to JSON and then deserialized on the other side back into a
         # Ruby object.
         obj = [@target, name, args]
-        if @at
-          @performable.perform_at(@at, ::YAML.dump(obj))
-        else
-          @performable.perform_async(::YAML.dump(obj))
-        end
+        @performable.client_push({ 'class' => @performable, 'args' => [::YAML.dump(obj)] }.merge(@opts))
       end
     end
 

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

@@ -3,8 +3,8 @@ module Sidekiq
     module Server
       class Logging
 
-        def call(*args)
-          Sidekiq::Logging.with_context("#{args[0].class.to_s} MSG-#{args[0].object_id.to_s(36)}") do
+        def call(worker, item, queue)
+          Sidekiq::Logging.with_context("#{worker.class.to_s} MSG-#{item['jid']}") do
             begin
               start = Time.now
               logger.info { "start" }

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

@@ -20,6 +20,13 @@ module Sidekiq
       #
       #     { 'class' => 'HardWorker', 'args' => [1, 2, 'foo'] }
       #
+      # The 'retry' option also accepts a number (in place of 'true'):
+      #
+      #     { 'class' => 'HardWorker', 'args' => [1, 2, 'foo'], 'retry' => 5 }
+      #
+      # The job will be retried this number of times before giving up. (If simply
+      # 'true', Sidekiq retries 25 times)
+      #
       # We'll add a bit more data to the message to support retries:
       #
       #  * 'queue' - the queue to use
@@ -35,13 +42,14 @@ module Sidekiq
         include Sidekiq::Util
 
         # delayed_job uses the same basic formula
-        MAX_COUNT = 25
+        DEFAULT_MAX_RETRY_ATTEMPTS = 25
         DELAY = proc { |count| (count ** 4) + 15 }
 
         def call(worker, msg, queue)
           yield
         rescue Exception => e
           raise e unless msg['retry']
+          max_retry_attempts = retry_attempts_from(msg['retry'], DEFAULT_MAX_RETRY_ATTEMPTS)
 
           msg['queue'] = queue
           msg['error_message'] = e.message
@@ -60,7 +68,7 @@ module Sidekiq
             msg['error_backtrace'] = e.backtrace[0..msg['backtrace'].to_i]
           end
 
-          if count <= MAX_COUNT
+          if count <= max_retry_attempts
             delay = DELAY.call(count)
             logger.debug { "Failure! Retry #{count} in #{delay} seconds" }
             retry_at = Time.now.to_f + delay
@@ -75,6 +83,14 @@ module Sidekiq
           raise e
         end
 
+        def retry_attempts_from(msg_retry, default)
+          if msg_retry.is_a?(Fixnum)
+            msg_retry
+          else
+            default
+          end
+        end
+
       end
     end
   end

data/lib/sidekiq/processor.rb

@@ -95,7 +95,7 @@ module Sidekiq
     end
 
     # Singleton classes are not clonable.
-    SINGLETON_CLASSES = [ NilClass, TrueClass, FalseClass, Symbol, Fixnum, Float ].freeze
+    SINGLETON_CLASSES = [ NilClass, TrueClass, FalseClass, Symbol, Fixnum, Float, Bignum ].freeze
 
     # Clone the arguments passed to the worker so that if
     # the message fails, what is pushed back onto Redis hasn't

data/lib/sidekiq/redis_connection.rb

@@ -5,7 +5,7 @@ require 'redis/namespace'
 module Sidekiq
   class RedisConnection
     def self.create(options={})
-      url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0'
+      url = options[:url] || determine_redis_provider || '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)
@@ -24,5 +24,12 @@ module Sidekiq
       end
     end
     private_class_method :build_client
+
+    # Not public
+    def self.determine_redis_provider
+      return ENV['REDISTOGO_URL'] if ENV['REDISTOGO_URL']
+      provider = ENV['REDIS_PROVIDER'] || 'REDIS_URL'
+      ENV[provider]
+    end
   end
 end

data/lib/sidekiq/testing.rb

@@ -1,6 +1,5 @@
 module Sidekiq
   module Worker
-
     ##
     # The Sidekiq testing infrastructure overrides perform_async
     # so that it does not actually touch the network.  Instead it
@@ -20,25 +19,83 @@ module Sidekiq
     #   assert_equal :something, HardWorker.jobs[0]['args'][0]
     #
     #   assert_equal 0, Sidekiq::Extensions::DelayedMailer.jobs.size
-    #   MyMailer.delayed.send_welcome_email('foo@example.com')
+    #   MyMailer.delay.send_welcome_email('foo@example.com')
+    #   assert_equal 1, Sidekiq::Extensions::DelayedMailer.jobs.size
+    #
+    # You can also clear and drain all workers' jobs:
+    #
+    #   assert_equal 0, Sidekiq::Extensions::DelayedMailer.jobs.size
+    #   assert_equal 0, Sidekiq::Extensions::DelayedModel.jobs.size
+    #
+    #   MyMailer.delay.send_welcome_email('foo@example.com')
+    #   MyModel.delay.do_something_hard
+    #
     #   assert_equal 1, Sidekiq::Extensions::DelayedMailer.jobs.size
+    #   assert_equal 1, Sidekiq::Extensions::DelayedModel.jobs.size
+    #
+    #   Sidekiq::Worker.clear_all # or .drain_all
+    #
+    #   assert_equal 0, Sidekiq::Extensions::DelayedMailer.jobs.size
+    #   assert_equal 0, Sidekiq::Extensions::DelayedModel.jobs.size
+    #
+    # This can be useful to make sure jobs don't linger between tests:
+    #
+    #   RSpec.configure do |config|
+    #     config.before(:each) do
+    #       Sidekiq::Worker.clear_all
+    #     end
+    #   end
+    #
+    # or for acceptance testing, i.e. with cucumber:
+    #
+    #   AfterStep do
+    #     Sidekiq::Worker.drain_all
+    #   end
+    #
+    #   When I sign up as "foo@example.com"
+    #   Then I should receive a welcome email to "foo@example.com"
     #
     module ClassMethods
       alias_method :client_push_old, :client_push
+
       def client_push(opts)
         jobs << opts
         true
       end
 
+      # Jobs queued for this worker
       def jobs
-        @pushed ||= []
+        Worker.jobs[self]
       end
 
+      # Clear all jobs for this worker
+      def clear
+        jobs.clear
+      end
+
+      # Drain and run all jobs for this worker
       def drain
         while job = jobs.shift do
           new.perform(*job['args'])
         end
       end
     end
+
+    class << self
+      def jobs # :nodoc:
+        @jobs ||= Hash.new { |hash, key| hash[key] = [] }
+      end
+
+      # Clear all queued jobs across all workers
+      def clear_all
+        jobs.clear
+      end
+
+      # Drain all queued jobs across all workers
+      def drain_all
+        jobs.keys.each(&:drain)
+        clear_all
+      end
+    end
   end
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.3.3"
+  VERSION = "2.4.0"
 end

data/lib/sidekiq/worker.rb

@@ -68,8 +68,8 @@ module Sidekiq
         hash
       end
 
-      def client_push(*args) # :nodoc:
-        Sidekiq::Client.push(*args)
+      def client_push(item) # :nodoc:
+        Sidekiq::Client.push(stringify_keys(item))
       end
 
     end

data/test/test_extensions.rb

@@ -29,6 +29,14 @@ class TestExtensions < MiniTest::Unit::TestCase
       assert_equal 1, Sidekiq.redis {|c| c.llen('queue:default') }
     end
 
+    it 'uses and stringifies specified options' do
+      assert_equal [], Sidekiq::Client.registered_queues
+      assert_equal 0, Sidekiq.redis {|c| c.llen('queue:notdefault') }
+      MyModel.delay(queue: :notdefault).long_class_method
+      assert_equal ['notdefault'], Sidekiq::Client.registered_queues
+      assert_equal 1, Sidekiq.redis {|c| c.llen('queue:notdefault') }
+    end
+
     it 'allows delayed scheduling of AR class methods' do
       assert_equal 0, Sidekiq.redis {|c| c.zcard('schedule') }
       MyModel.delay_for(5.days).long_class_method

data/test/test_redis_connection.rb

@@ -0,0 +1,46 @@
+require 'helper'
+require 'sidekiq/redis_connection'
+
+class TestRedisConnection < MiniTest::Unit::TestCase
+
+  describe ".create" do
+
+    def with_env_var(var, uri, skip_provider=false)
+      vars = ['REDISTOGO_URL', 'REDIS_PROVIDER', 'REDIS_URL'] - [var]
+      vars.each do |v|
+        next if skip_provider
+        ENV[v] = nil
+      end
+      ENV[var] = uri
+      assert_equal uri, Sidekiq::RedisConnection.determine_redis_provider
+      ENV[var] = nil
+    end
+
+    describe "with REDISTOGO_URL set" do
+      it "sets connection URI to RedisToGo" do
+        with_env_var 'REDISTOGO_URL', 'redis://redis-to-go:6379/0'
+      end
+    end
+
+    describe "with REDIS_PROVIDER set" do
+      it "sets connection URI to the provider" do
+        uri = 'redis://sidekiq-redis-provider:6379/0'
+        provider = 'SIDEKIQ_REDIS_PROVIDER'
+
+        ENV['REDIS_PROVIDER'] = provider
+        ENV[provider] = uri
+
+        with_env_var provider, uri, true
+
+        ENV[provider] = nil
+      end
+    end
+
+    describe "with REDIS_URL set" do
+      it "sets connection URI to custom uri" do
+        with_env_var 'REDIS_URL', 'redis://redis-uri:6379/0'
+      end
+    end
+
+  end
+end

data/test/test_retry.rb

@@ -88,17 +88,51 @@ class TestRetry < MiniTest::Unit::TestCase
       @redis.verify
     end
 
-    it 'throws away old messages after too many retries' do
+    it 'handles a recurring failed message before reaching user-specifed max' do
+      @redis.expect :zadd, 1, ['retry', String, String]
       now = Time.now.utc
-      msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry_count"=>25}
+      msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], 'retry' => 11, "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry_count"=>10}
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
         handler.call('', msg, 'default') do
           raise "kerblammo!"
         end
       end
+      assert_equal 'default', msg["queue"]
+      assert_equal 'kerblammo!', msg["error_message"]
+      assert_equal 'RuntimeError', msg["error_class"]
+      assert_equal 11, msg["retry_count"]
+      assert msg["failed_at"]
       @redis.verify
     end
+
+    it 'throws away old messages after too many retries (using the default)' do
+      now = Time.now.utc
+      msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry"=>true, "retry_count"=>25}
+      @redis.expect :zadd, 1, [ 'retry', String, String ]
+      handler = Sidekiq::Middleware::Server::RetryJobs.new
+      assert_raises RuntimeError do
+        handler.call('', msg, 'default') do
+          raise "kerblammo!"
+        end
+      end
+      # MiniTest can't assert that a method call did NOT happen!?
+      assert_raises(MockExpectationError) { @redis.verify }
+    end
+
+    it 'throws away old messages after too many retries (using user-specified max)' do
+      now = Time.now.utc
+      msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry"=>3, "retry_count"=>3}
+      @redis.expect :zadd, 1, [ 'retry', String, String ]
+      handler = Sidekiq::Middleware::Server::RetryJobs.new
+      assert_raises RuntimeError do
+        handler.call('', msg, 'default') do
+          raise "kerblammo!"
+        end
+      end
+      # MiniTest can't assert that a method call did NOT happen!?
+      assert_raises(MockExpectationError) { @redis.verify }
+    end
   end
 
   describe 'poller' do

data/test/test_testing.rb

@@ -110,5 +110,72 @@ class TestTesting < MiniTest::Unit::TestCase
       end
       assert_equal 0, StoredWorker.jobs.size
     end
+
+    class FirstWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      self.count = 0
+      def perform
+        self.class.count += 1
+      end
+    end
+
+    class SecondWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      self.count = 0
+      def perform
+        self.class.count += 1
+      end
+    end
+
+    it 'clears jobs across all workers' do
+      Sidekiq::Worker.jobs.clear
+      FirstWorker.count = 0
+      SecondWorker.count = 0
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      FirstWorker.perform_async
+      SecondWorker.perform_async
+
+      assert_equal 1, FirstWorker.jobs.size
+      assert_equal 1, SecondWorker.jobs.size
+
+      Sidekiq::Worker.clear_all
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      assert_equal 0, FirstWorker.count
+      assert_equal 0, SecondWorker.count
+    end
+
+    it 'drains jobs across all workers' do
+      Sidekiq::Worker.jobs.clear
+      FirstWorker.count = 0
+      SecondWorker.count = 0
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      assert_equal 0, FirstWorker.count
+      assert_equal 0, SecondWorker.count
+
+      FirstWorker.perform_async
+      SecondWorker.perform_async
+
+      assert_equal 1, FirstWorker.jobs.size
+      assert_equal 1, SecondWorker.jobs.size
+
+      Sidekiq::Worker.drain_all
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      assert_equal 1, FirstWorker.count
+      assert_equal 1, SecondWorker.count
+    end
   end
 end

data/web/assets/javascripts/application.js

@@ -4,7 +4,8 @@
 //= require_tree .
 
 $(function() {
-  $.timeago.settings.allowFuture = true
+  $.timeago.settings.allowFuture = true;
+  $.timeago.settings.refreshMillis = 0;
   $("time").timeago();
 });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70336704844540 !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: *70336704844540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70336704844000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336704844000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70336704843460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70336704843460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70336704842820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70336704842820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70336704842140 !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: *70336704842140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70336704841420 !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: *70336704841420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70336704840840 !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: *70336704840840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70336704840180 !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: *70336704840180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70336704839540 !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: *70336704839540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70336704855400 !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: *70336704855400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70336704854900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +181,15 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70336704854900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70336704854520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336704854520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -155,6 +215,7 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
+- COMM-LICENSE
 - Changes.md
 - Gemfile
 - LICENSE
@@ -218,6 +279,7 @@ files:
 - test/test_fetch.rb
 - test/test_middleware.rb
 - test/test_processor.rb
+- test/test_redis_connection.rb
 - test/test_retry.rb
 - test/test_scheduling.rb
 - test/test_stats.rb
@@ -266,7 +328,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
@@ -281,6 +343,7 @@ test_files:
 - test/test_fetch.rb
 - test/test_middleware.rb
 - test/test_processor.rb
+- test/test_redis_connection.rb
 - test/test_retry.rb
 - test/test_scheduling.rb
 - test/test_stats.rb