magick-feature-flags 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a34f03026e8631bc2d29c0935cb98e472e7ed387fc4628edc357776423bfc2c5
-  data.tar.gz: d87af21843efb22d5dba60d342f3beb5fd807eb42f1b2948c82ae8dc3d6b67a2
+  metadata.gz: 58eabf5855bcd4578d09090c65cc5b8d1b33ba2caa38ae7dd85bf7ecebb76047
+  data.tar.gz: e57e675ff58e913e60ef883b4dd8078087c7575ef5ced4355c8811bb15bf2dd3
 SHA512:
-  metadata.gz: '0296397245455dbecd448a2dab448b2209579f4c9c39a1e93b424e8f6982fe8a3f498140ac7af5f1127c70fc2cdaa3378194135afe2e55fe9254646a4c761e64'
-  data.tar.gz: 43e1ce6dcf51815f83ccf4440845d415f8d351e6a6038c8f7bcd0a294dfc0def6531a04a118119d66e71a64d7cfcc1607273eda0c181dfdf951c9ee61d4cfae7
+  metadata.gz: 3fdaf5955fcf00d83047ff4ed785476b91b89e9d53ad80d890459e77134cf974cfe53a204060e471c491f133cd4d88f88e0f91813e042e5bf311821e09d804ea
+  data.tar.gz: d09483c77bb6af18a7f24565366d08e28a725c95d741c8cdcbf0ae3abcd17d8c3e0626942668a41f9041120a786f0463d35567c4ccfaaca3f56826f2888aa682

data/lib/magick/adapters/registry.rb

@@ -21,11 +21,34 @@ module Magick
         @last_reload_times = {} # Track last reload time per feature for debouncing
         @local_writes = {} # Track recent local writes to skip self-invalidation
         @reload_mutex = Mutex.new
+        @stopping = false
+        @shutdown_mutex = Mutex.new
         # Only start Pub/Sub subscriber if Redis is available
         # In memory-only mode, each process has isolated cache (no cross-process invalidation)
         start_cache_invalidation_subscriber if redis_adapter
       end
 
+      # Gracefully terminate the Pub/Sub subscriber thread and its Redis connection.
+      # Without this, Ruby/Puma shutdown waits on the blocking `subscribe` call.
+      def shutdown(timeout: 5)
+        @shutdown_mutex.synchronize do
+          return if @stopping
+
+          @stopping = true
+        end
+
+        close_subscriber_connection(@subscriber)
+        terminate_subscriber_thread(@subscriber_thread, timeout)
+
+        @subscriber = nil
+        @subscriber_thread = nil
+        true
+      end
+
+      def stopping?
+        @stopping == true
+      end
+
       def get(feature_name, key)
         # Try memory first (fastest) - no Redis calls needed thanks to Pub/Sub invalidation
         value = memory_adapter.get(feature_name, key) if memory_adapter
@@ -288,6 +311,32 @@ module Magick
 
       attr_reader :memory_adapter, :redis_adapter, :active_record_adapter, :circuit_breaker
 
+      # Signal the subscribe loop to return, then close the connection so any
+      # retry/reconnect attempt fails fast instead of sleeping for 5s.
+      def close_subscriber_connection(subscriber)
+        return unless subscriber
+
+        begin
+          subscriber.unsubscribe(CACHE_INVALIDATION_CHANNEL)
+        rescue StandardError
+          # connection may already be dead; fall through to close/kill
+        end
+
+        begin
+          subscriber.close
+        rescue StandardError
+          # ignore: best-effort close
+        end
+      end
+
+      def terminate_subscriber_thread(thread, timeout)
+        return unless thread
+        return if thread.join(timeout)
+
+        thread.kill
+        thread.join(1) # give it a moment to actually unwind
+      end
+
       # Record that this process just wrote a feature, so the subscriber
       # ignores its own Pub/Sub messages and doesn't revert the correct in-memory state.
       def record_local_write(feature_name)
@@ -421,9 +470,13 @@ module Magick
                            (defined?(Rails) && Rails.env.test?)
           return if is_rspec_error
 
+          # Stop cleanly during app shutdown instead of sleeping + retrying,
+          # which would keep the process alive and delay termination.
+          return if @stopping
+
           warn "Cache invalidation subscriber error: #{e.message}" if defined?(Rails) && Rails.env.development?
           sleep 5
-          retry
+          retry unless @stopping
         end
         @subscriber_thread.abort_on_exception = false
       end

data/lib/magick/rails/railtie.rb

@@ -125,6 +125,17 @@ if defined?(Rails)
             Magick.performance_metrics.enable_redis_tracking(enable: true)
           end
         end
+
+        # Terminate the Pub/Sub subscriber + async metrics thread on process exit.
+        # Without this, Ruby waits on the blocking `Redis#subscribe` call inside
+        # the subscriber thread and Puma/Rails shutdown stalls.
+        initializer 'magick.shutdown_hook' do
+          at_exit do
+            Magick.shutdown!
+          rescue StandardError
+            # Best-effort: never raise from an at_exit handler.
+          end
+        end
       end
     end
 

data/lib/magick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/lib/magick.rb

@@ -265,6 +265,15 @@ module Magick
       @performance_metrics&.clear!
     end
 
+    # Gracefully terminate background threads (Redis Pub/Sub subscriber,
+    # async metrics processor) so the host process can exit promptly.
+    # Intended for use in Rails shutdown hooks, `at_exit`, or tests.
+    def shutdown!(timeout: 5)
+      safely_shutdown(@adapter_registry) { |r| r.shutdown(timeout: timeout) }
+      safely_shutdown(@performance_metrics, &:stop_async_processor)
+      true
+    end
+
     # Get default adapter registry (public method for use by other classes)
     def default_adapter_registry
       @default_adapter_registry ||= begin
@@ -279,5 +288,15 @@ module Magick
     end
 
     private
+
+    # Run a cleanup action on a collaborator, swallowing errors so that
+    # shutdown hooks (at_exit, Rails) never raise.
+    def safely_shutdown(collaborator)
+      return unless collaborator
+
+      yield(collaborator)
+    rescue StandardError
+      # Best-effort: termination paths must not raise.
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magick-feature-flags
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Andrew Lobanov