sidekiq-pauzer 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0cfd697bb2a9f06be2bd59ef44bbb4ffc6f5bcf073d67117e5f4df50f04774c
-  data.tar.gz: 1b2712b8d2bec0253e32386d966798b76e7d33f2590833761c3c3d231631bbb6
+  metadata.gz: e7ba4ea9d9b061ee7d506874e2f6dd7e3128d912f194df3f7eea66e134ee5342
+  data.tar.gz: e7c7a9140a6fb5e450b13ab2f97740908036d4cca4d28a1dbb40cea1210ce7b9
 SHA512:
-  metadata.gz: 38beb5711a6a1eef4aa51cc538642e4de4dd7c5a51a12c8bd2084430034da09b4b0c6fea78a9da14192372319735fd53ce76ed92a47b9b4a4957ff8112df0fc7
-  data.tar.gz: 052b517478b5cae0f700cf8f94f044c19398519f5d65c285290e08f6117d70a1fb80ec8a984b0d78bfb1a4c9670d139d9d78e431fc54a70e8a74f08d4238c22d
+  metadata.gz: 1abbf6aa4603205e520b197f93b08f6ad485a285c33dd64bb1b7eb01b8e54f80f0622a816d2fabf43b369c16abdf73beda3b220446ea023f9fe197bd11eeb7f0
+  data.tar.gz: f70b7cff1ef0955a932c0df368425213524bcf286d6ec4bc9803cf2486c246b835d2c6ae5c3c1f118b7c7adcc09e929a124295218183e45daf266eebca779535

data/lib/sidekiq/pauzer/queues.rb

@@ -20,32 +20,36 @@ module Sidekiq
 
       # @param config [Config]
       def initialize(config)
-        @names      = [].freeze
-        @config     = config
-        @init_mutex = Mutex.new
-        @poll_mutex = Mutex.new
-        @refresher  = nil
+        @config          = config
+        @names           = [].freeze
+        @names_mutex     = Mutex.new
+        @refresher       = nil
+        @refresher_mutex = Mutex.new
       end
 
       def each(&block)
         return to_enum __method__ unless block
 
         start_refresher unless refresher_running?
-        @poll_mutex.synchronize { @names.dup }.each(&block)
+        @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]
@@ -55,19 +59,16 @@ module Sidekiq
       end
 
       def start_refresher
-        @init_mutex.synchronize do
-          @refresher ||= Concurrent::TimerTask.new(execution_interval: refresh_rate, run_now: true) do
-            refresh
-          end
-
-          @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
-        @init_mutex.synchronize do
+        @refresher_mutex.synchronize do
           @refresher&.shutdown
           @refresher = nil
         end
@@ -76,17 +77,26 @@ module Sidekiq
       end
 
       def refresher_running?
-        @init_mutex.synchronize { @refresher&.running? || false }
+        @refresher_mutex.synchronize do
+          @refresher&.running? || false
+        end
       end
 
       private
 
+      # @return [nil]
       def refresh
-        names = Sidekiq.redis { |conn| conn.call("SMEMBERS", redis_key).to_a }
+        names = redis_call("SMEMBERS", redis_key).to_a
 
-        @poll_mutex.synchronize { @names = names.each(&:freeze).freeze }
+        @names_mutex.synchronize do
+          @names = names.each(&:freeze).freeze
+        end
 
-        self
+        nil
+      end
+
+      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.2.0"
+    VERSION = "4.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pauzer
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-23 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.2.0
-  bug_tracker_uri: https://gitlab.com/ixti/sidekiq-pauzer/issues
-  changelog_uri: https://gitlab.com/ixti/sidekiq-pauzer/blob/v4.2.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: []