neetodeploy-autoscale 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b4ae0e9d4ca64aa8defb71b1a48f95ddfc8dd6ead0c36da7718e102596e6bd
-  data.tar.gz: bbddecea047a1fe57852b6ccc50040e60d0617498d29dfd25b56780d37a8ba1d
+  metadata.gz: bffc52d124f0b677da6669f6b34b26347b0710396d362a17af10cb22dbf029a9
+  data.tar.gz: dd98640212220a0d4426d2fce3066f4764e1194a79da602b03428bc0c10e7dc3
 SHA512:
-  metadata.gz: e0cb2130f7a0453d1ddeef3e580ae4347bb1041ca7367839e3a54cb95c2dfd7ad60c7f8a11f14974f0ba4e4eebf0160ff7f3c8d92ec7bce3014badb924bad88e
-  data.tar.gz: d2974979d2cb668b1d36bee0e77dd1c0a1c7b680557faebcb560ce5b8d09e3fcd5f87f36366ae978daaa7840b86cb8c624372c313e8a1f14fdd010a9ed92d409
+  metadata.gz: 1e1b0fe71a3a89605214d79c971f63f52bbd75804dabf4b75b817824e65941a861fe7f32f159efc7126f5d53da8b1755b954d96efe8bb66341097a9afcad38a6
+  data.tar.gz: fa8e816a7be8dbdb7395272cd1c4ce67509b1048fb41feca137a62802ffb8607ebc3edc399c17faaf1a9fdbcfce5d5c6ef39ca5f0bf7cd959badcf1ebc46ce78

data/lib/neetodeploy/autoscale/config.rb

@@ -24,7 +24,7 @@ module Neetodeploy
     end
 
     def use_puma_queue_size?
-      use_puma_queue_size == true
+      use_puma_queue_size
     end
   end
 end

data/lib/neetodeploy/autoscale/rails/metrics_collector.rb

@@ -32,29 +32,33 @@ module Neetodeploy
       end
 
       def running?
-        @pid == Process.pid and @thread&.alive?
+        @pid == Process.pid && @thread&.alive?
       end
 
       def start_thread_with_collector_loop(config = Config.instance)
         @thread = Thread.new do
-          metrics_store = MetricsStore.instance unless config.use_puma_queue_size?
           loop do
-            if config.use_puma_queue_size?
-              run_puma_metrics_collection(config)
-            else
-              run_queue_time_collection(metrics_store, config)
+            begin
+              metrics_store = MetricsStore.instance unless config.use_puma_queue_size?
+              loop do
+                if config.use_puma_queue_size?
+                  run_puma_metrics_collection(config)
+                else
+                  run_queue_time_collection(metrics_store, config)
+                end
+                multiplier = 1 - (rand / 4)
+                sleep config.report_interval_seconds * multiplier
+              end
+            rescue StandardError => e
+              logger.error("Rails metrics collector thread terminated with error: #{e.message}")
+              logger.error(e.backtrace.join("\n")) if e.backtrace
+              
+              # Only restart if we're still the same process and thread should continue
+              break unless @pid == Process.pid && !@thread.nil?
+              
+              logger.info("Restarting Rails metrics collector thread")
+              sleep(5)
             end
-            multiplier = 1 - (rand / 4)
-            sleep config.report_interval_seconds * multiplier
-          end
-        rescue StandardError => e
-          logger.error("Rails metrics collector thread terminated with error: #{e.message}")
-          logger.error(e.backtrace.join("\n")) if e.backtrace
-        ensure
-          if @pid == Process.pid && !@thread.nil?
-            logger.info("Restarting Rails metrics collector thread")
-            sleep(5)
-            start_thread_with_collector_loop
           end
         end
       end

data/lib/neetodeploy/autoscale/sidekiq/metrics_collector.rb

@@ -29,24 +29,30 @@ module Neetodeploy
       end
 
       def running?
-        @pid == Process.pid and @thread&.alive?
+        @pid == Process.pid && @thread&.alive?
       end
 
       def start_thread_with_collector_loop(config = Config.instance)
         @thread = Thread.new do
+          # Use a non-recursive loop pattern to avoid SystemStackError and ThreadError on shutdown
           loop do
-            run_sidekiq_metrics_collection
-            multiplier = 1 - (rand / 4)
-            sleep config.report_interval_seconds * multiplier
-          end
-        rescue StandardError => e
-          logger.error("Sidekiq metrics collector thread terminated with error: #{e.message}")
-          logger.error(e.backtrace.join("\n")) if e.backtrace
-        ensure
-          if @pid == Process.pid && !@thread.nil?
-            logger.info("Restarting Sidekiq metrics collector thread")
-            sleep(5)
-            start_thread_with_collector_loop
+            begin
+              loop do
+                run_sidekiq_metrics_collection
+                multiplier = 1 - (rand / 4)
+                sleep config.report_interval_seconds * multiplier
+              end
+            rescue StandardError => e
+              logger.error("Sidekiq metrics collector thread terminated with error: #{e.message}")
+              logger.error(e.backtrace.join("\n")) if e.backtrace
+              
+              # Only restart if we're still the same process and thread should continue
+              # Check if Sidekiq is shutting down to avoid ThreadError during shutdown
+              break unless @pid == Process.pid && !@thread.nil? && sidekiq_running?
+              
+              logger.info("Restarting Sidekiq metrics collector thread")
+              sleep(5)
+            end
           end
         end
       end
@@ -73,6 +79,11 @@ module Neetodeploy
         defined?(::Sidekiq) && ::Sidekiq.respond_to?(:redis)
       end
 
+      def sidekiq_running?
+        # Check if Sidekiq server is still running to avoid restarting during shutdown
+        defined?(::Sidekiq) && ::Sidekiq.respond_to?(:server?) && ::Sidekiq.server?
+      end
+
       def collect_queue_metrics(queue)
         queue_name = queue.name
         latency_ms = (queue.latency * 1000).ceil

data/lib/neetodeploy/autoscale/version.rb

@@ -2,6 +2,6 @@
 
 module Neetodeploy
   module Autoscale
-    VERSION = "2.0.4"
+    VERSION = "2.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy-autoscale
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Sreeram Venkitesh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-13 00:00:00.000000000 Z
+date: 2025-11-14 00:00:00.000000000 Z
 dependencies: []
 description: For automatically scaling your Rails application based on network metrics
 email: