sidekiq-throttled 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5eb064ad2211b8e21d3a5936b953d68174545a
-  data.tar.gz: 90107848a47f41d73d2646d82a8a6c5c013cad20
+  metadata.gz: caf7b98eeb976c1114776cb1981a3bd6b7c218f8
+  data.tar.gz: 1945f409e2048660611a1a7ede586bb573899d51
 SHA512:
-  metadata.gz: f4471f6d39fa2e29071f6b66fa256e257040c61192b8110e6ef1bc15fd15e93e5b7318250b0f5c76259974c407278490069b9e6ed541f83ab0ce83218ffaf957
-  data.tar.gz: 4f53ef0e1b5c7cf1a2ba0a1c973525aa4a4ef0cb40809b08435d5d7403cee52664cf685ee0c8b61711573763913e89cc74c09136d65d2b173a560caf4c580dbe
+  metadata.gz: 6b6640758e9fea0d59f715d87071da32300dc54e3397b2e9c90f16bbcfb90e9bfd22153e607cdfbbe7cd04359ef0e920f9a59b37c8870bfd467c71b239951e1e
+  data.tar.gz: e6ea732bdbb2818828203823a7620fd681eacae992eff09422bc57f9a659ecb1fa992a08e1191c50df0cad346af980000074855c7f87fd705c4af62f8cdd01a1

data/CHANGES.md

@@ -1,3 +1,14 @@
+## 0.7.1 (2017-03-30)
+
+* Fix summary bar queues link when queue ui was enhanced.
+  ([@ixti])
+
+* [#31](https://github.com/sensortower/sidekiq-throttled/pull/31)
+  [#30](https://github.com/sensortower/sidekiq-throttled/issues/30)
+  Do not throttle if limit is `nil`.
+  ([@ixti])
+
+
 ## 0.7.0 (2017-03-22)
 
 * Expose pause/resume queues hidden feature to UI. This was available via API

data/lib/sidekiq/throttled.rb

@@ -3,7 +3,7 @@
 require "sidekiq"
 
 # internal
-require "sidekiq/version"
+require "sidekiq/throttled/version"
 require "sidekiq/throttled/communicator"
 require "sidekiq/throttled/queues_pauser"
 require "sidekiq/throttled/registry"

data/lib/sidekiq/throttled/strategy/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Throttled
+    class Strategy
+      module Base
+        def limit(job_args = nil)
+          @limit.respond_to?(:call) ? @limit.call(*job_args) : @limit
+        end
+
+        private
+
+        def key(job_args)
+          key = @base_key.dup
+          key << ":#{@key_suffix.call(*job_args)}" if @key_suffix
+          key
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/throttled/strategy/concurrency.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-# internal
+
+require "sidekiq/throttled/strategy/base"
 require "sidekiq/throttled/strategy/script"
 
 module Sidekiq
@@ -7,13 +8,17 @@ module Sidekiq
     class Strategy
       # Concurrency throttling strategy
       class Concurrency
+        include Base
+
         # LUA script used to limit fetch concurrency.
         # Logic behind the scene can be described in following pseudo code:
         #
-        #     return 1 if @limit <= LLEN(@key)
-        #
-        #     PUSH(@key, @jid)
-        #     return 0
+        #     if @limit <= LLEN(@key)
+        #       return 1
+        #     else
+        #       PUSH(@key, @jid)
+        #       return 0
+        #     end
         SCRIPT = Script.read "#{__dir__}/concurrency.lua"
         private_constant :SCRIPT
 
@@ -29,12 +34,6 @@ module Sidekiq
           @key_suffix = key_suffix
         end
 
-        # @return [Integer] Amount of allowed concurrent job processors
-        def limit(job_args = nil)
-          return @limit.to_i unless @limit.respond_to? :call
-          @limit.call(*job_args).to_i
-        end
-
         # @return [Boolean] Whenever strategy has dynamic config
         def dynamic?
           @key_suffix || @limit.respond_to?(:call)
@@ -42,7 +41,12 @@ module Sidekiq
 
         # @return [Boolean] whenever job is throttled or not
         def throttled?(jid, *job_args)
-          1 == SCRIPT.eval([key(job_args)], [jid.to_s, limit(job_args), @ttl])
+          return false unless (job_limit = limit(job_args))
+
+          keys = [key(job_args)]
+          args = [jid.to_s, job_limit, @ttl]
+
+          1 == SCRIPT.eval(keys, args)
         end
 
         # @return [Integer] Current count of jobs
@@ -61,14 +65,6 @@ module Sidekiq
         def finalize!(jid, *job_args)
           Sidekiq.redis { |conn| conn.srem(key(job_args), jid.to_s) }
         end
-
-        private
-
-        def key(job_args)
-          key = @base_key.dup
-          key << ":#{@key_suffix.call(*job_args)}" if @key_suffix
-          key
-        end
       end
     end
   end

data/lib/sidekiq/throttled/strategy/threshold.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-# internal
+
+require "sidekiq/throttled/strategy/base"
 require "sidekiq/throttled/strategy/script"
 
 module Sidekiq
@@ -9,6 +10,8 @@ module Sidekiq
       # @todo Use redis TIME command instead of sending current timestamp from
       #   sidekiq manager. See: http://redis.io/commands/time
       class Threshold
+        include Base
+
         # LUA script used to limit fetch threshold.
         # Logic behind the scene can be described in following pseudo code:
         #
@@ -41,12 +44,6 @@ module Sidekiq
           @key_suffix = key_suffix
         end
 
-        # @return [Integer] Amount of jobs allowed per period
-        def limit(job_args = nil)
-          return @limit.to_i unless @limit.respond_to? :call
-          @limit.call(*job_args).to_i
-        end
-
         # @return [Float] Period in seconds
         def period(job_args = nil)
           return @period.to_f unless @period.respond_to? :call
@@ -60,10 +57,12 @@ module Sidekiq
 
         # @return [Boolean] whenever job is throttled or not
         def throttled?(*job_args)
-          key = key(job_args)
-          limit = limit(job_args)
-          period = period(job_args)
-          1 == SCRIPT.eval([key], [limit, period, Time.now.to_f])
+          return false unless (job_limit = limit(job_args))
+
+          keys = [key(job_args)]
+          args = [job_limit, period(job_args), Time.now.to_f]
+
+          1 == SCRIPT.eval(keys, args)
         end
 
         # @return [Integer] Current count of jobs
@@ -76,14 +75,6 @@ module Sidekiq
         def reset!(*job_args)
           Sidekiq.redis { |conn| conn.del(key(job_args)) }
         end
-
-        private
-
-        def key(job_args)
-          key = @base_key.dup
-          key << ":#{@key_suffix.call(*job_args)}" if @key_suffix
-          key
-        end
       end
     end
   end

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/lib/sidekiq/throttled/web.rb

@@ -10,6 +10,7 @@ require "sidekiq/web"
 # internal
 require "sidekiq/throttled/registry"
 require "sidekiq/throttled/web/stats"
+require "sidekiq/throttled/web/summary_fix"
 
 module Sidekiq
   module Throttled
@@ -22,6 +23,7 @@ module Sidekiq
       class << self
         # Replace default Queues tab with enhanced one.
         def enhance_queues_tab!
+          SummaryFix.enabled = true
           Sidekiq::Web::DEFAULT_TABS["Queues"] = "enhanced-queues"
           Sidekiq::Web.tabs.delete("Enhanced Queues")
         end
@@ -31,12 +33,14 @@ module Sidekiq
         # @api There's next to absolutely no value in this method for real
         #   users. The only it's purpose is to restore virgin state in specs.
         def restore_queues_tab!
+          SummaryFix.enabled = false
           Sidekiq::Web::DEFAULT_TABS["Queues"] = "queues"
           Sidekiq::Web.tabs["Enhanced Queues"] = "enhanced-queues"
         end
 
         # @api private
         def registered(app)
+          app.send(:include, SummaryFix)
           register_throttled_tab app
           register_enhanced_queues_tab app
         end

data/lib/sidekiq/throttled/web/summary_fix.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Throttled
+    module Web
+      module SummaryFix
+        JAVASCRIPT = <<-JAVASCRIPT
+        <script>
+          $(function ($el) {
+            var $el = $(".summary li.enqueued > a"),
+                url = $el.attr("href").replace(/\/queues$/, "/enhanced-queues");
+            $el.attr("href", url);
+          });
+        </script>
+        JAVASCRIPT
+
+        class << self
+          attr_accessor :enabled
+        end
+
+        def display_custom_head
+          SummaryFix.enabled ? "#{super}#{JAVASCRIPT}" : super
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -76,6 +76,7 @@ files:
 - lib/sidekiq/throttled/queues_pauser.rb
 - lib/sidekiq/throttled/registry.rb
 - lib/sidekiq/throttled/strategy.rb
+- lib/sidekiq/throttled/strategy/base.rb
 - lib/sidekiq/throttled/strategy/concurrency.lua
 - lib/sidekiq/throttled/strategy/concurrency.rb
 - lib/sidekiq/throttled/strategy/script.rb
@@ -86,6 +87,7 @@ files:
 - lib/sidekiq/throttled/web.rb
 - lib/sidekiq/throttled/web/queues.html.erb
 - lib/sidekiq/throttled/web/stats.rb
+- lib/sidekiq/throttled/web/summary_fix.rb
 - lib/sidekiq/throttled/web/throttled.html.erb
 - lib/sidekiq/throttled/worker.rb
 - sidekiq-throttled.gemspec
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Concurrency and threshold throttling for Sidekiq.