sidekiq 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92ef60dcba913bb8fdbb05e1c0a8dec0071146f3
-  data.tar.gz: 7c607121e01d8df3e83c09ab77876fde573cb1af
+  metadata.gz: d32882da4b01eefa0b25a91791c4580293642b24
+  data.tar.gz: ced4b35fcc8a0804a482eb64e8b0af88bf6b5b50
 SHA512:
-  metadata.gz: 980ecb9625038a8b0211d73ab6ac8176f6c7bf55c03da3c7e810016169ba76449ad43e602be337e1cc4d094aa2a9229ff565d37dd8bb6f094de62a34f61bc8e5
-  data.tar.gz: 420995af74088296a8ebf722f438be5b57f1a459acb0678956223d85341b8a4352a268da65b9ef4bcab3c275b5b66f7db3113fe75d6f52f6c1d2188a264d7867
+  metadata.gz: 00caf9ea622f2c1e35706a07c77e02a420b381f482f158de1a1ea4c4b9a3f3a478df5df654bf9982b4ce434088b3401b596274cfd15985299ca6d54931a056ea
+  data.tar.gz: 00cf54c70ec9d4b2ced99dc06ecb7dc39cf57ed938ad16f6cdf2198ea96609f2d83c95841c72a3140e1203a6abdba68476e92d0a801cbb58fe3f1939842e3a20

data/Changes.md

@@ -1,7 +1,27 @@
+# Sidekiq Changes
+
+3.5.2
+-----------
+
+- **Sidekiq 3 is now in maintenance mode**, only major bugs will be fixed.
+- The exception triggering a retry is now passed into `sidekiq_retry_in`,
+  allowing you to retry more frequently for certain types of errors.
+  [#2619, kreynolds]
+```ruby
+  sidekiq_retry_in do |count, ex|
+    case ex
+    when RuntimeError
+      5 * count
+    else
+      10 * count
+    end
+  end
+```
+
 3.5.1
 -----------
 
-- **FIX MEMORY LEAK** Under rare conditions, threads may leak [#2598]
+- **FIX MEMORY LEAK** Under rare conditions, threads may leak [#2598, gazay]
 - Add Ukranian locale [#2561, elrakita]
 - Disconnect and retry Redis operations if we see a READONLY error [#2550]
 - Add server middleware testing harness; see [wiki](https://github.com/mperham/sidekiq/wiki/Testing#testing-server-middleware) [#2534, ryansch]

data/Ent-Changes.md

@@ -3,6 +3,17 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+0.7.5
+----------
+
+- Fix dynamic creation of concurrent limiters [#2617]
+
+0.7.4
+----------
+- Add additional check to prevent duplicate periodic job creation
+- Allow user-specified TTLs for rate limiters [#2607]
+- Paginate rate limiter index page [#2606]
+
 0.7.3
 ----------
 
@@ -11,7 +22,6 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
   rate limit errors.
 - Fix scalability issue with Limiter index page.
 
-
 0.7.2
 ----------
 
@@ -23,7 +33,6 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
 - Fix issue where unique scheduled jobs can't be enqueued upon schedule
   due to the existing unique lock. [#2499]
 
-
 0.7.0
 ----------
 

data/Pro-Changes.md

@@ -3,6 +3,12 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+2.1.1
+-----------
+
+- Make ShardSet lazier so Redis can first be initialized at startup. [#2603]
+
+
 2.1.0
 -----------
 

data/lib/sidekiq/cli.rb

@@ -346,7 +346,11 @@ module Sidekiq
         die 1
       end
       @parser.parse!(argv)
-      opts[:config_file] ||= 'config/sidekiq.yml' if File.exist?('config/sidekiq.yml')
+
+      %w[config/sidekiq.yml config/sidekiq.yml.erb].each do |filename|
+        opts[:config_file] ||= filename if File.exist?(filename)
+      end
+
       opts
     end
 

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

@@ -121,7 +121,7 @@ module Sidekiq
           end
 
           if count < max_retry_attempts
-            delay = delay_for(worker, count)
+            delay = delay_for(worker, count, exception)
             logger.debug { "Failure! Retry #{count} in #{delay} seconds" }
             retry_at = Time.now.to_f + delay
             payload = Sidekiq.dump_json(msg)
@@ -170,8 +170,8 @@ module Sidekiq
           end
         end
 
-        def delay_for(worker, count)
-          worker.sidekiq_retry_in_block? && retry_in(worker, count) || seconds_to_delay(count)
+        def delay_for(worker, count, exception)
+          worker.sidekiq_retry_in_block? && retry_in(worker, count, exception) || seconds_to_delay(count)
         end
 
         # delayed_job uses the same basic formula
@@ -179,9 +179,9 @@ module Sidekiq
           (count ** 4) + 15 + (rand(30)*(count+1))
         end
 
-        def retry_in(worker, count)
+        def retry_in(worker, count, exception)
           begin
-            worker.sidekiq_retry_in_block.call(count).to_i
+            worker.sidekiq_retry_in_block.call(count, exception).to_i
           rescue Exception => e
             handle_exception(e, { context: "Failure scheduling retry using the defined `sidekiq_retry_in` in #{worker.class.name}, falling back to default" })
             nil

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.5.1"
+  VERSION = "3.5.2"
 end

data/lib/sidekiq/worker.rb

@@ -38,6 +38,18 @@ module Sidekiq
 
     module ClassMethods
 
+      def delay(*args)
+        raise ArgumentError, "Do not call .delay on a Sidekiq::Worker class, call .perform_async"
+      end
+
+      def delay_for(*args)
+        raise ArgumentError, "Do not call .delay_for on a Sidekiq::Worker class, call .perform_in"
+      end
+
+      def delay_until(*args)
+        raise ArgumentError, "Do not call .delay_until on a Sidekiq::Worker class, call .perform_at"
+      end
+
       def perform_async(*args)
         client_push('class' => self, 'args' => args)
       end

data/test/test_api.rb

@@ -202,10 +202,10 @@ class TestApi < Sidekiq::Test
     end
 
     it 'unwraps delayed jobs' do
-      ApiWorker.delay.foo(1,2,3)
+      Sidekiq::Queue.delay.foo(1,2,3)
       q = Sidekiq::Queue.new
       x = q.first
-      assert_equal "TestApi::ApiWorker.foo", x.display_class
+      assert_equal "Sidekiq::Queue.foo", x.display_class
       assert_equal [1,2,3], x.display_args
     end
 

data/test/test_retry.rb

@@ -229,7 +229,7 @@ class TestRetry < Sidekiq::Test
         File.unlink @tmp_log_path if File.exist?(@tmp_log_path)
       end
 
-      class CustomWorker
+      class CustomWorkerWithoutException
         include Sidekiq::Worker
 
         sidekiq_retry_in do |count|
@@ -237,6 +237,19 @@ class TestRetry < Sidekiq::Test
         end
       end
 
+      class CustomWorkerWithException
+        include Sidekiq::Worker
+
+        sidekiq_retry_in do |count, exception|
+          case exception
+          when ArgumentError
+            count * 4
+          else
+            count * 2
+          end
+        end
+      end
+
       class ErrorWorker
         include Sidekiq::Worker
 
@@ -246,15 +259,23 @@ class TestRetry < Sidekiq::Test
       end
 
       it "retries with a default delay" do
-        refute_equal 4, handler.__send__(:delay_for, worker, 2)
+        refute_equal 4, handler.__send__(:delay_for, worker, 2, StandardError.new)
+      end
+
+      it "retries with a custom delay and exception 1" do
+        assert_equal 8, handler.__send__(:delay_for, CustomWorkerWithException, 2, ArgumentError.new)
+      end
+
+      it "retries with a custom delay and exception 2" do
+        assert_equal 4, handler.__send__(:delay_for, CustomWorkerWithException, 2, StandardError.new)
       end
 
-      it "retries with a custom delay" do
-        assert_equal 4, handler.__send__(:delay_for, CustomWorker, 2)
+      it "retries with a custom delay without exception" do
+        assert_equal 4, handler.__send__(:delay_for, CustomWorkerWithoutException, 2, StandardError.new)
       end
 
       it "falls back to the default retry on exception" do
-        refute_equal 4, handler.__send__(:delay_for, ErrorWorker, 2)
+        refute_equal 4, handler.__send__(:delay_for, ErrorWorker, 2, StandardError.new)
         assert_match(/Failure scheduling retry using the defined `sidekiq_retry_in`/,
                      File.read(@tmp_log_path), 'Log entry missing for sidekiq_retry_in')
       end

data/web/assets/javascripts/application.js

@@ -58,9 +58,14 @@ function updatePage(url) {
       url: url,
       dataType: 'html'
     }).done(function (data) {
-      var $page = $(data).filter('#page')
+      $data = $(data)
+
+      var $page = $data.filter('#page')
       $('#page').replaceWith($page)
 
+      var $header_status = $data.find('.status')
+      $('.status').replaceWith($header_status)
+
       $("time").timeago()
     })
   }, parseInt(localStorage.timeInterval) || 2000);

data/web/assets/stylesheets/application.css

@@ -181,6 +181,10 @@ form .btn {
   margin-right: 5px;
 }
 
+form .btn-group .btn {
+  margin-right: 1px;
+}
+
 td form {
   margin-bottom: 0;
 }

data/web/views/busy.erb

@@ -12,7 +12,6 @@
     </form>
   </div>
 </div>
-</div>
 
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped table-white">

data/web/views/layout.erb

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
     <meta name="google" content="notranslate" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -263,6 +263,7 @@ files:
 - test/test_web_helpers.rb
 - web/assets/images/bootstrap/glyphicons-halflings-white.png
 - web/assets/images/bootstrap/glyphicons-halflings.png
+- web/assets/images/favicon.ico
 - web/assets/images/logo.png
 - web/assets/images/status-sd8051fd480.png
 - web/assets/images/status/active.png
@@ -377,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby