neetodeploy-autoscale 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b4ae0e9d4ca64aa8defb71b1a48f95ddfc8dd6ead0c36da7718e102596e6bd
-  data.tar.gz: bbddecea047a1fe57852b6ccc50040e60d0617498d29dfd25b56780d37a8ba1d
+  metadata.gz: 5c7265603142b311a9ff85c2bb44678261113c889ef554399132dd6f4d41931d
+  data.tar.gz: 6ab7a1fc5cb14f7b2c7ebb93fea67266cbe9c34b41abd4d3bcf2e4c7ecd41c0f
 SHA512:
-  metadata.gz: e0cb2130f7a0453d1ddeef3e580ae4347bb1041ca7367839e3a54cb95c2dfd7ad60c7f8a11f14974f0ba4e4eebf0160ff7f3c8d92ec7bce3014badb924bad88e
-  data.tar.gz: d2974979d2cb668b1d36bee0e77dd1c0a1c7b680557faebcb560ce5b8d09e3fcd5f87f36366ae978daaa7840b86cb8c624372c313e8a1f14fdd010a9ed92d409
+  metadata.gz: 628156b95ff204ecbc18ca301c318618d474495c506896859ecdd3f53c93dcda4a3e7bf18dc4c69d1d4eb5db2dfdb99dd49a9d051bc3f856d9d58559f30a4e89
+  data.tar.gz: ac9de8142aa4599e664c4637ff3738dcbeb9888ec67c98029e0d1dbf734e050d4943cc5a60a1cca67e70b37b6823dacbfa4c7137387de795b7e1c60c66261205

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

@@ -37,24 +37,28 @@ module Neetodeploy
 
       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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy-autoscale
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Sreeram Venkitesh