sidekiq-max-jobs 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae8b389a6961487e91003baca5d13e15237f3cff0732cd789a57ead24781deba
-  data.tar.gz: 3aaedb46b7abb7f78cb0794bb759561ea632b208787ae8218a9a75d8ac511856
+  metadata.gz: 88185f0bd0aa5075fae604f768a9b011edf6c4d349bb8d5fe32a177488bca55a
+  data.tar.gz: a0fde7488aa0115cd4402c07508922cfe91faa7cf57e5589297432522f3fd97f
 SHA512:
-  metadata.gz: 5e40e4105fededa4a8b4b3513673bd3fcbbdb83e6ae9c0cf064cfa30bc32d66ccca61f9dbcedbbce91ccd4c40312af6a5dc90bcc057f74e663d72c2cc47b848c
-  data.tar.gz: 632290222af419e9ddb70e86bb58adb20e1a4bd5123079f816d81fd03ad676e5c27939852b6c11378a09a733c451550cb78735ceb4ad49efebbe8197f06f3f01
+  metadata.gz: 675e4bb41052bfd805c2abb42686cad52bcb6a3fd8f0e70dac7974571b495dc8a3acb7fd3a4f249badc845e8c83ba2423034345d683ad0f0da19ee021b983753
+  data.tar.gz: 36742d445b462d6539a11c4d99e35503d32754d70c0096b9825593d1dac0ddee5815b6adadd7d6e98a6d07b1afc167f9f74d7ba424fc7e4ebafe16eb87c98fb7

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-06-09 22:11:35 -0500 using RuboCop version 0.85.1.
+# on 2020-06-17 19:26:25 -0500 using RuboCop version 0.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -22,6 +22,11 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 26
 
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 102
+
 # Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:

data/README.md

@@ -66,7 +66,14 @@ behavior (currently only configurable via the environment):
 * `MAX_JOBS_JITTER`: Used as the upper-bound for calculating a random number
 between 1 and the value specified. This value is added to the `MAX_JOBS` value,
 mentioned above, to decrease the likelihood that all of your `Worker(s)`
-restart at / around the same time (default: `1`)
+restart at / around the same time (default: `rand(1)`)
+* `MAX_JOBS_<QUEUE>`: The number of jobs to process for a specific queue before
+terminating (default: `(ENV['MAX_JOBS'] || 100).to_i`)
+* `MAX_JOBS_JITTER_<QUEUE>`: Used as the upper-bound for calculating a random
+number between 1 and the value specified. This value is added to the
+`MAX_JOBS_<QUEUE>` value, mentioned above, to decreased the likelihood that all
+of your `Worker(s)` restart at / around the same time (default:
+`rand((ENV['MAX_JOBS_JITTER'] || 1).to_i)`)
 
 Contributing
 ------------

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

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

@@ -16,12 +16,26 @@ module Sidekiq
         ).strip
 
         class << self
-          def counter
-            @counter ||= 0
+          def cache
+            @cache ||= {}
           end
 
-          def increment_counter!
-            @counter = counter.next
+          def counter(queue)
+            key = counter_key(queue)
+            return cache[key] if cache.include?(key)
+
+            cache[key] = 0
+          end
+
+          def counter_key(queue)
+            "COUNTER_#{queue.upcase}"
+          end
+
+          def increment_counter!(queue)
+            key = counter_key(queue)
+            counter = cache[key] || 0
+
+            cache[key] = counter.next
           end
 
           def log_info(message)
@@ -29,23 +43,61 @@ module Sidekiq
           end
 
           def log_initialization!
-            log_info("Max-Jobs middleware enabled, shutting down pid: #{pid} after: #{max_jobs_with_jitter} job(s)")
+            log_info("Max-Jobs middleware enabled, shutting down pid: #{pid} after max-jobs threshold reached")
+          end
+
+          def max_jobs(queue)
+            key = max_jobs_key(queue)
+            return cache[key] if cache.include?(key)
+
+            cache[key] = (
+              ENV[key] ||
+              ENV['MAX_JOBS'] ||
+              100
+            ).to_i
           end
 
-          def max_jobs
-            @max_jobs ||= (ENV['MAX_JOBS'] || 100).to_i
+          def max_jobs_key(queue)
+            "MAX_JOBS_#{queue.upcase}"
           end
 
-          def max_jobs_jitter
-            @max_jobs_jitter ||= rand((ENV['MAX_JOBS_JITTER'] || 1).to_i)
+          def max_jobs_jitter(queue)
+            key = max_jobs_jitter_key(queue)
+            return cache[key] if cache.include?(key)
+
+            cache[key] = rand(
+              (
+                ENV[key] ||
+                ENV['MAX_JOBS_JITTER'] ||
+                1
+              ).to_i
+            )
+          end
+
+          def max_jobs_jitter_key(queue)
+            "MAX_JOBS_JITTER_#{queue.upcase}"
           end
 
-          def max_jobs_with_jitter
-            @max_jobs_with_jitter ||= max_jobs + max_jobs_jitter
+          def max_jobs_with_jitter(queue)
+            key = max_jobs_with_jitter_key(queue)
+            return cache[key] if cache.include?(key)
+
+            cache[key] = max_jobs(queue) + max_jobs_jitter(queue)
+          end
+
+          def max_jobs_with_jitter_key(queue)
+            "MAX_JOBS_WITH_JITTER_#{queue.upcase}"
+          end
+
+          def mutex(queue)
+            key = mutex_key(queue)
+            return cache[key] if cache.include?(key)
+
+            cache[key] = ::Mutex.new
           end
 
-          def mutex
-            @mutex ||= ::Mutex.new
+          def mutex_key(queue)
+            "MUTEX_#{queue.upcase}"
           end
 
           def pid
@@ -54,9 +106,9 @@ module Sidekiq
         end
 
         def call(
-          _,  # worker-instance
-          _,  # item
-          _   # queue
+          _,     # worker-instance
+          _,     # item
+          queue
         )
           exception_raised = false
           begin
@@ -69,10 +121,10 @@ module Sidekiq
             raise
           ensure
             if !exception_raised
-              self.class.mutex.synchronize do
-                self.class.increment_counter!
+              self.class.mutex(queue).synchronize do
+                self.class.increment_counter!(queue)
 
-                if self.class.counter == self.class.max_jobs_with_jitter
+                if self.class.counter(queue) == self.class.max_jobs_with_jitter(queue)
                   self.class.log_info("Max-Jobs quota met, shutting down pid: #{self.class.pid}")
                   ::Process.kill('TERM', self.class.pid)
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-max-jobs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Jonathan W. Zaleski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq