sidekiq-pauzer 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4907f516e85f120c7f3bab0c18d1832995d3b31cfd788fb4f3bed2258c9cf0b
-  data.tar.gz: f697759608b23f58eec74cae99d0c5ec6773f1f7304b87e5f34d4e3dd437f0a3
+  metadata.gz: e7ba4ea9d9b061ee7d506874e2f6dd7e3128d912f194df3f7eea66e134ee5342
+  data.tar.gz: e7c7a9140a6fb5e450b13ab2f97740908036d4cca4d28a1dbb40cea1210ce7b9
 SHA512:
-  metadata.gz: a89c0004ea1ef1bd6684e1778194a3ec63be336df0a46a19870c3a3cd97e12d9a24e00c448562fd1e095de0c1ad94bbce2a299d640e2fcad16a6fddac8077463
-  data.tar.gz: a13a58fc1cd1fdadfa91ad211c0095f85e7b48be126c73b169cf7fa645fd6866df81ea5be845097f4ece5acdbd9c910ed49af95b113e59b6a428dcb6f9783e32
+  metadata.gz: 1abbf6aa4603205e520b197f93b08f6ad485a285c33dd64bb1b7eb01b8e54f80f0622a816d2fabf43b369c16abdf73beda3b220446ea023f9fe197bd11eeb7f0
+  data.tar.gz: f70b7cff1ef0955a932c0df368425213524bcf286d6ec4bc9803cf2486c246b835d2c6ae5c3c1f118b7c7adcc09e929a124295218183e45daf266eebca779535

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,41 +1,55 @@
 # 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)
+        @config          = config
+        @names           = [].freeze
+        @names_mutex     = Mutex.new
+        @refresher       = nil
+        @refresher_mutex = Mutex.new
       end
 
       def each(&block)
         return to_enum __method__ unless block
 
-        @names.each(&block)
+        start_refresher unless refresher_running?
+        @names_mutex.synchronize { @names.dup }.each(&block)
 
         self
       end
 
       # @param name [#to_s]
+      # @return [Queues] self
       def pause!(name)
-        Sidekiq.redis { |conn| conn.call("SADD", @redis_key, name.to_s) }
+        redis_call("SADD", redis_key, name.to_s)
         refresh
+        self
       end
 
       # @param name [#to_s]
+      # @return [Queues] self
       def unpause!(name)
-        Sidekiq.redis { |conn| conn.call("SREM", @redis_key, name.to_s) }
+        redis_call("SREM", redis_key, name.to_s)
         refresh
+        self
       end
 
       # @param name [#to_s]
@@ -45,35 +59,44 @@ module Sidekiq
       end
 
       def start_refresher
-        @refresher.execute
+        @refresher_mutex.synchronize do
+          @refresher&.shutdown
+          @refresher = Concurrent::TimerTask.execute(execution_interval: refresh_rate, run_now: true) { refresh }
+        end
 
         self
       end
 
       def stop_refresher
-        @refresher.shutdown
+        @refresher_mutex.synchronize do
+          @refresher&.shutdown
+          @refresher = nil
+        end
 
         self
       end
 
       def refresher_running?
-        @refresher.running?
+        @refresher_mutex.synchronize do
+          @refresher&.running? || false
+        end
       end
 
       private
 
-      def initialize_refresher(refresh_rate)
-        Refresher.new(execution_interval: refresh_rate, run_now: true) do
-          refresh
-        end
-      end
-
+      # @return [nil]
       def refresh
-        names = Sidekiq.redis { |conn| conn.call("SMEMBERS", @redis_key).to_a }
+        names = redis_call("SMEMBERS", redis_key).to_a
+
+        @names_mutex.synchronize do
+          @names = names.each(&:freeze).freeze
+        end
 
-        @mutex.synchronize { @names = names.each(&:freeze).freeze }
+        nil
+      end
 
-        self
+      def redis_call(...)
+        Sidekiq.redis { |conn| conn.call(...) }
       end
     end
   end

data/lib/sidekiq/pauzer/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Pauzer
-    VERSION = "4.1.0"
+    VERSION = "4.2.1"
   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.1
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -58,14 +58,14 @@ files:
 - lib/sidekiq/pauzer/version.rb
 - lib/sidekiq/pauzer/web.rb
 - web/views/queues.erb
-homepage: https://gitlab.com/ixti/sidekiq-pauzer
+homepage: https://github.com/ixti/sidekiq-pauzer
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://gitlab.com/ixti/sidekiq-pauzer
-  source_code_uri: https://gitlab.com/ixti/sidekiq-pauzer/tree/v4.1.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
+  homepage_uri: https://github.com/ixti/sidekiq-pauzer
+  source_code_uri: https://github.com/ixti/sidekiq-pauzer/tree/v4.2.1
+  bug_tracker_uri: https://github.com/ixti/sidekiq-pauzer/issues
+  changelog_uri: https://github.com/ixti/sidekiq-pauzer/blob/v4.2.1/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []