sidekiq-pauzer 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4907f516e85f120c7f3bab0c18d1832995d3b31cfd788fb4f3bed2258c9cf0b
-  data.tar.gz: f697759608b23f58eec74cae99d0c5ec6773f1f7304b87e5f34d4e3dd437f0a3
+  metadata.gz: e0cfd697bb2a9f06be2bd59ef44bbb4ffc6f5bcf073d67117e5f4df50f04774c
+  data.tar.gz: 1b2712b8d2bec0253e32386d966798b76e7d33f2590833761c3c3d231631bbb6
 SHA512:
-  metadata.gz: a89c0004ea1ef1bd6684e1778194a3ec63be336df0a46a19870c3a3cd97e12d9a24e00c448562fd1e095de0c1ad94bbce2a299d640e2fcad16a6fddac8077463
-  data.tar.gz: a13a58fc1cd1fdadfa91ad211c0095f85e7b48be126c73b169cf7fa645fd6866df81ea5be845097f4ece5acdbd9c910ed49af95b113e59b6a428dcb6f9783e32
+  metadata.gz: 38beb5711a6a1eef4aa51cc538642e4de4dd7c5a51a12c8bd2084430034da09b4b0c6fea78a9da14192372319735fd53ce76ed92a47b9b4a4957ff8112df0fc7
+  data.tar.gz: 052b517478b5cae0f700cf8f94f044c19398519f5d65c285290e08f6117d70a1fb80ec8a984b0d78bfb1a4c9670d139d9d78e431fc54a70e8a74f08d4238c22d

data/README.adoc

@@ -30,6 +30,15 @@ Sidekiq::Pauzer.configure do |config|
 end
 ----
 
+When running in forked environment (e.g., Puma web server), you also need to
+call `Sidekiq::Pauzer.startup` on fork:
+
+[source, ruby]
+----
+# file: config/puma.rb
+on_worker_boot { Sidekiq::Pauzer.startup }
+----
+
 === API
 
 This gem enhances Sidekiq's Queue API with:

data/lib/sidekiq/pauzer/queues.rb

@@ -1,40 +1,50 @@
 # frozen_string_literal: true
 
+require "forwardable"
 require "concurrent"
 
 module Sidekiq
   module Pauzer
     # @api internal
     class Queues
+      extend Forwardable
       include Enumerable
 
-      class Refresher < Concurrent::TimerTask; end
+      # @!attribute [r] redis_key
+      #   @see (Config#redis_key)
+      def_delegators :@config, :redis_key
+
+      # @!attribute [r] refresh_rate
+      #   @see (Config#refresh_rate)
+      def_delegators :@config, :refresh_rate
 
       # @param config [Config]
       def initialize(config)
-        @mutex     = Mutex.new
-        @names     = [].freeze
-        @redis_key = config.redis_key
-        @refresher = initialize_refresher(config.refresh_rate)
+        @names      = [].freeze
+        @config     = config
+        @init_mutex = Mutex.new
+        @poll_mutex = Mutex.new
+        @refresher  = nil
       end
 
       def each(&block)
         return to_enum __method__ unless block
 
-        @names.each(&block)
+        start_refresher unless refresher_running?
+        @poll_mutex.synchronize { @names.dup }.each(&block)
 
         self
       end
 
       # @param name [#to_s]
       def pause!(name)
-        Sidekiq.redis { |conn| conn.call("SADD", @redis_key, name.to_s) }
+        Sidekiq.redis { |conn| conn.call("SADD", redis_key, name.to_s) }
         refresh
       end
 
       # @param name [#to_s]
       def unpause!(name)
-        Sidekiq.redis { |conn| conn.call("SREM", @redis_key, name.to_s) }
+        Sidekiq.redis { |conn| conn.call("SREM", redis_key, name.to_s) }
         refresh
       end
 
@@ -45,33 +55,36 @@ module Sidekiq
       end
 
       def start_refresher
-        @refresher.execute
+        @init_mutex.synchronize do
+          @refresher ||= Concurrent::TimerTask.new(execution_interval: refresh_rate, run_now: true) do
+            refresh
+          end
+
+          @refresher.execute
+        end
 
         self
       end
 
       def stop_refresher
-        @refresher.shutdown
+        @init_mutex.synchronize do
+          @refresher&.shutdown
+          @refresher = nil
+        end
 
         self
       end
 
       def refresher_running?
-        @refresher.running?
+        @init_mutex.synchronize { @refresher&.running? || false }
       end
 
       private
 
-      def initialize_refresher(refresh_rate)
-        Refresher.new(execution_interval: refresh_rate, run_now: true) do
-          refresh
-        end
-      end
-
       def refresh
-        names = Sidekiq.redis { |conn| conn.call("SMEMBERS", @redis_key).to_a }
+        names = Sidekiq.redis { |conn| conn.call("SMEMBERS", redis_key).to_a }
 
-        @mutex.synchronize { @names = names.each(&:freeze).freeze }
+        @poll_mutex.synchronize { @names = names.each(&:freeze).freeze }
 
         self
       end

data/lib/sidekiq/pauzer/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Pauzer
-    VERSION = "4.1.0"
+    VERSION = "4.2.0"
   end
 end

data/lib/sidekiq/pauzer.rb

@@ -108,7 +108,7 @@ module Sidekiq
       end
 
       def startup
-        MUTEX.synchronize { @queues.start_refresher }
+        MUTEX.synchronize { reinit_queues.start_refresher }
 
         self
       end
@@ -122,10 +122,8 @@ module Sidekiq
       private
 
       def reinit_queues
-        start_refresher = @queues.refresher_running?
         @queues.stop_refresher
         @queues = Queues.new(@config)
-        @queues.start_refresher if start_refresher
       end
     end
   end

data/web/views/queues.erb

@@ -1,3 +1,5 @@
+<!-- sidekiq-pauzer <%= Sidekiq::Pauzer::VERSION %> -->
+
 <div class="header-container">
   <h1><%= t('Queues') %></h1>
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pauzer
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -63,9 +63,9 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://gitlab.com/ixti/sidekiq-pauzer
-  source_code_uri: https://gitlab.com/ixti/sidekiq-pauzer/tree/v4.1.0
+  source_code_uri: https://gitlab.com/ixti/sidekiq-pauzer/tree/v4.2.0
   bug_tracker_uri: https://gitlab.com/ixti/sidekiq-pauzer/issues
-  changelog_uri: https://gitlab.com/ixti/sidekiq-pauzer/blob/v4.1.0/CHANGES.md
+  changelog_uri: https://gitlab.com/ixti/sidekiq-pauzer/blob/v4.2.0/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []